summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-03-14 14:19:09 +0000
committerJeroen Roovers <jer@gentoo.org>2014-03-14 14:19:09 +0000
commitac4ce4b193de50ae1312d6358a8d31ddf73f1547 (patch)
tree2cede32e772b05e3b1079d5507b5ba57ddb30b23 /www-client/w3m
parentVersion bump. Removed old (diff)
downloadgentoo-2-ac4ce4b193de50ae1312d6358a8d31ddf73f1547.tar.gz
gentoo-2-ac4ce4b193de50ae1312d6358a8d31ddf73f1547.tar.bz2
gentoo-2-ac4ce4b193de50ae1312d6358a8d31ddf73f1547.zip
Fix one more parallel make issue (bug #362249).
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'www-client/w3m')
-rw-r--r--www-client/w3m/ChangeLog6
-rw-r--r--www-client/w3m/files/w3m-0.5.3-parallel-make.patch16
-rw-r--r--www-client/w3m/w3m-0.5.3-r5.ebuild7
3 files changed, 19 insertions, 10 deletions
diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog
index 6b688c2a9e83..c5d691afe9ee 100644
--- a/www-client/w3m/ChangeLog
+++ b/www-client/w3m/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/w3m
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.82 2014/03/14 13:56:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.83 2014/03/14 14:19:09 jer Exp $
+
+ 14 Mar 2014; Jeroen Roovers <jer@gentoo.org> w3m-0.5.3-r5.ebuild,
+ files/w3m-0.5.3-parallel-make.patch:
+ Fix one more parallel make issue (bug #362249).
*w3m-0.5.3-r5 (14 Mar 2014)
diff --git a/www-client/w3m/files/w3m-0.5.3-parallel-make.patch b/www-client/w3m/files/w3m-0.5.3-parallel-make.patch
index 8d89b9309575..427e3be20d55 100644
--- a/www-client/w3m/files/w3m-0.5.3-parallel-make.patch
+++ b/www-client/w3m/files/w3m-0.5.3-parallel-make.patch
@@ -1,6 +1,5 @@
-diff -Naur w3m-0.5.3.orig/w3mimg/Makefile.in w3m-0.5.3/w3mimg/Makefile.in
---- w3m-0.5.3.orig/w3mimg/Makefile.in 2011-01-04 18:22:28.000000000 +0900
-+++ w3m-0.5.3/w3mimg/Makefile.in 2011-02-02 11:35:47.725076601 +0900
+--- a/w3mimg/Makefile.in
++++ b/w3mimg/Makefile.in
@@ -22,6 +22,8 @@
$(AR) rv $@ $(IMGOBJS)
$(RANLIB) $@
@@ -10,3 +9,14 @@ diff -Naur w3m-0.5.3.orig/w3mimg/Makefile.in w3m-0.5.3/w3mimg/Makefile.in
w3mimg.o: w3mimg.c
$(CC) $(CFLAGS) -c $<
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -250,7 +250,7 @@
+ (cd $$subdir && $(MAKE) install); \
+ done
+
+-all-scripts:
++all-scripts: funcname.tab
+ for dir in $(SCRIPTSUBDIRS); \
+ do \
+ (cd $$dir && $(MAKE) $(MAKE_ARGS)); \
diff --git a/www-client/w3m/w3m-0.5.3-r5.ebuild b/www-client/w3m/w3m-0.5.3-r5.ebuild
index d0eebd4fda11..0d2a676a7556 100644
--- a/www-client/w3m/w3m-0.5.3-r5.ebuild
+++ b/www-client/w3m/w3m-0.5.3-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.3-r5.ebuild,v 1.1 2014/03/14 13:56:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.3-r5.ebuild,v 1.2 2014/03/14 14:19:09 jer Exp $
EAPI=5
inherit autotools eutils
@@ -109,11 +109,6 @@ src_configure() {
${myconf}
}
-src_compile() {
- # bug #362249
- emake -j1
-}
-
src_install() {
emake DESTDIR="${D}" install