Add Martin von Gagern <Martin dot vGagern at gmx dot net>'s patch to fix parallel compilation for bug 116665.

(Portage version: 2.1_pre4-r1 vanquishing potions will fly)

4 files changed, 89 insertions, 15 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index b6170ae58794..6c7624af3f18 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.107 2006/02/28 03:51:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.108 2006/03/01 00:30:36 vanquirius Exp $
+
+  01 Mar 2006; Marcelo Goes <vanquirius@gentoo.org>
+  +files/netpbm-10.32-parallel.patch, netpbm-10.32.ebuild:
+  Add Martin von Gagern <Martin dot vGagern at gmx dot net>'s patch to fix
+  parallel compilation for bug 116665.
 
 *netpbm-10.32 (28 Feb 2006)
 
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 7bd3214a0452..6b890f39f8a7 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 19821407b67f49ee67e49326b74b9e32 ChangeLog 15089
 RMD160 6ee8388b0f1297229f2e3545ae4ff1cc6aad98aa ChangeLog 15089
 SHA256 38365d327aae733ec1d3926113af1700372b66487a658ead797857adb0a96014 ChangeLog 15089
@@ -64,6 +61,9 @@ SHA256 dc9052a14086507d0e99cda367a50aea2c15aca97b5eea36867ea35df61da932 files/ne
 MD5 0d32ba4e0bc01d32022c6f91040015af files/netpbm-10.31-pnmtopng-modtime-segfault.patch 989
 RMD160 9f55aa507dd204d6f780aa3a33978945a2be117d files/netpbm-10.31-pnmtopng-modtime-segfault.patch 989
 SHA256 7d90e69e49a370ded4d1d4b8c7fb2c4946a5d4555b6fed83312ac44ef1d054ee files/netpbm-10.31-pnmtopng-modtime-segfault.patch 989
+MD5 b1f727ca5ab6515f5d4973fb85521bba files/netpbm-10.32-parallel.patch 2726
+RMD160 8246092242b9df50137ea1fb677e01b54c8f68bf files/netpbm-10.32-parallel.patch 2726
+SHA256 453465c99f8ac7ab2a6194c4c78e48a3f53744bba2a8697a33742908e588d826 files/netpbm-10.32-parallel.patch 2726
 MD5 ef9c07e7cbf6b830f8dd61e59fb0a34b files/netpbm-dSAFER.patch 818
 RMD160 7fd5d781027967dab727ff5587010597834d38af files/netpbm-dSAFER.patch 818
 SHA256 e90f484373a1e53b9ba27635caf6d22585a9425ee6532d89fdce07f38819161d files/netpbm-dSAFER.patch 818
@@ -85,13 +85,6 @@ SHA256 42354d0b2f47d856cd1936649e669e601edf34e9276949214acbf0e1eab5f079 netpbm-1
 MD5 376467977073e2e1a153b805da6c2176 netpbm-10.31-r1.ebuild 3122
 RMD160 33854c559778bdb41ad7917602422ab52471cac5 netpbm-10.31-r1.ebuild 3122
 SHA256 d7e14b2bb73a23bb46f74e8081ab717265ee1db5322b57adf5a4cc8297e9388a netpbm-10.31-r1.ebuild 3122
-MD5 265a3963c237d68da11b345bd768a0fd netpbm-10.32.ebuild 2888
-RMD160 368688dba41482818c43ed980b0e74926597f5fb netpbm-10.32.ebuild 2888
-SHA256 bf7156ba34548f43d1db14b6a188e402782fc5a6252fa8641039c3dd758b7f39 netpbm-10.32.ebuild 2888
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEA8je2+ySkm8kpY0RAmNXAKCBgIfRpmvMMpccmT1JUP3SGoVmPwCeMGJj
-LUkffLNiXCzot8XC8Ijo2xg=
-=2rpf
------END PGP SIGNATURE-----
+MD5 83cadf89fc86741e03f0b6b1a825006b netpbm-10.32.ebuild 2938
+RMD160 0565ba04485f4f77ad7dbf4ea56b39950aa08f9d netpbm-10.32.ebuild 2938
+SHA256 f2ef2663ddc9665bd6bb8f24341b5081f49cc5d9868e760a9a437ee0dea35adb netpbm-10.32.ebuild 2938
diff --git a/media-libs/netpbm/files/netpbm-10.32-parallel.patch b/media-libs/netpbm/files/netpbm-10.32-parallel.patch
new file mode 100644
index 000000000000..0cc1644489ec
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.32-parallel.patch
@@ -0,0 +1,75 @@
+Bug #116665: parallel build fails
+
+There are two problems.
+1. inttypes_netpbm.h is required by many files that include Makefile.common
+   via the target importinc, but the rule to create it is included only in
+   the root file GNUmakefile.
+2. Several makefiles in subdirectories do not contain complete dependency
+   information, especially dependencies on generated header files.
+   This is addressed by making importinc a dependencie of recursive calls
+   to make all.
+
+This patch also contains some changes between SRCDIR and BUILDDIR.
+As those are the same on Gentoo builds, these changes have not been tested.
+
+  2006-03-01 Martin von Gagern <Martin.vGagern@gmx.net>
+
+diff -rux Makefile.config netpbm-10.32/GNUmakefile netpbm/GNUmakefile
+--- netpbm-10.32/GNUmakefile	2006-02-25 20:02:54.000000000 +0100
++++ netpbm/GNUmakefile	2006-02-28 23:57:29.000000000 +0100
+@@ -89,6 +89,7 @@
+ 
+ OMIT_CONFIG_RULE = 1
+ OMIT_VERSION_H_RULE = 1
++OMIT_INTTYPES_RULE = 1
+ include $(SRCDIR)/Makefile.common
+ 
+ $(BUILDDIR)/Makefile.config: $(SRCDIR)/Makefile.config.in
+@@ -107,7 +108,7 @@
+ 
+ DELETEIT = (rm -f $@ || false)
+ 
+-inttypes_netpbm.h: $(TYPEGEN)
++$(BUILDDIR)/inttypes_netpbm.h: $(TYPEGEN)
+ 	$(TYPEGEN) >$@ || $(DELETEIT)
+ 
+ # We run a couple of programs on the build machine in computing the
+diff -rux Makefile.config netpbm-10.32/Makefile.common netpbm/Makefile.common
+--- netpbm-10.32/Makefile.common	2006-02-25 19:53:48.000000000 +0100
++++ netpbm/Makefile.common	2006-02-28 23:53:49.000000000 +0100
+@@ -129,13 +129,11 @@
+   $(IMPORTINC_LIB_FILES) \
+   $(IMPORTINC_LIB_UTIL_FILES) \
+ 
+-$(IMPORTINC_ROOT_FILES):importinc/%:$(SRCDIR)/%
++$(IMPORTINC_ROOT_FILES):importinc/%:$(BUILDDIR)/%
+ 	mkdir -p importinc
+ 	rm -f $@
+ 	$(SYMLINK) $< $@
+ 
+-importinc/pm_config.h: $(BUILDDIR)/pm_config.h
+-
+ $(IMPORTINC_LIB_FILES):importinc/%:$(SRCDIR)/lib/%
+ 	mkdir -p importinc
+ 	rm -f $@
+@@ -168,6 +166,11 @@
+ 	$(MAKE) -C $(dir $@) $(notdir $@)
+ endif
+ 
++ifneq ($(OMIT_INTTYPES_RULE),1)
++$(BUILDDIR)/inttypes_netpbm.h:
++	$(MAKE) -C $(dir $@) -f $(SRCDIR)/GNUmakefile $(notdir $@)
++endif
++
+ # Note that any time you do a make on a fresh Netpbm source tree,
+ # Make notices that 'Makefile.config', which the make files include, does not
+ # exist and runs the "Makefile.config" target, which runs Configure.
+@@ -484,7 +487,7 @@
+ %/install.merge:
+ 	$(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \
+ 	    SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) 
+-$(SUBDIRS:%=%/all): %/all: $(CURDIR)/%
++$(SUBDIRS:%=%/all): %/all: $(CURDIR)/% importinc
+ 	$(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \
+ 	    SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) 
+ $(SUBDIRS:%=%/mergetrylist): %/mergetrylist: $(CURDIR)/% FORCE
diff --git a/media-libs/netpbm/netpbm-10.32.ebuild b/media-libs/netpbm/netpbm-10.32.ebuild
index f7418799b14d..3420996a3758 100644
--- a/media-libs/netpbm/netpbm-10.32.ebuild
+++ b/media-libs/netpbm/netpbm-10.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.32.ebuild,v 1.1 2006/02/28 03:51:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.32.ebuild,v 1.2 2006/03/01 00:30:36 vanquirius Exp $
 
 inherit flag-o-matic toolchain-funcs eutils multilib
 
@@ -50,6 +50,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/netpbm-10.31-build.patch
 	epatch "${FILESDIR}"/netpbm-10.30-tifftopnm.patch
+	epatch "${FILESDIR}"/netpbm-10.32-parallel.patch
 
 	rm -f configure
 	cp Makefile.config.in Makefile.config