fix parallel make, by Diego Pettenò <flameeyes@gentoo.org>, bug #236030.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.3 x86_64

4 files changed, 111 insertions, 8 deletions

diff --git a/media-gfx/sam2p/ChangeLog b/media-gfx/sam2p/ChangeLog
index 20b7fa1f95fc..f2ff4f3f4445 100644
--- a/media-gfx/sam2p/ChangeLog
+++ b/media-gfx/sam2p/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/sam2p
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/ChangeLog,v 1.29 2008/08/23 17:29:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/ChangeLog,v 1.30 2008/08/28 17:29:28 aballier Exp $
+
+  28 Aug 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/sam2p-0.45-parallelmake.patch, sam2p-0.45-r1.ebuild:
+  fix parallel make, by Diego Pettenò <flameeyes@gentoo.org>, bug #236030.
 
   23 Aug 2008; Markus Meier <maekke@gentoo.org> sam2p-0.45-r1.ebuild:
   x86 stable, bug #232306
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index 87814e903797..cfedcf219379 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -4,15 +4,16 @@ Hash: SHA1
 AUX sam2p-0.45-cflags.patch 1294 RMD160 eeadcc13c88f1685cdbb15d50fe49ccc738f2a15 SHA1 0218fa834218e51937625b9e0168c709db5fb7a0 SHA256 31fec5d1396185336d33e0ed2d0b005264f4af6b8c63b6b39a2947d07e69ca9e
 AUX sam2p-0.45-fbsd.patch 319 RMD160 7f4afe0d92224471aa2ad96eeefe9e9fa05c2db1 SHA1 24522fb8171c52249cbb57c52d16ae9e6196cc5a SHA256 44944d770cb7dc515c54b325d46451edefb89b73ac3b407374d18b7639a26d80
 AUX sam2p-0.45-nostrip.patch 346 RMD160 31f61d64c0013f8e35711068e3fcd8e878a320ae SHA1 2ea36b9fe1441246cb7b0443ac528932e82188f3 SHA256 5bb2ed5ac221bc2e27459b66510e3ca4c521f460f4fe4539439d582b35af9188
+AUX sam2p-0.45-parallelmake.patch 3736 RMD160 d012738ea178ea8ec945bc36ca165b09dce3c1af SHA1 78849b017bc330d08e975155ee61bda22138044b SHA256 97f48c3e9a6f9dbc1b741a5c70e037c0ccd3a343cef0582a4496f5a7b5cfc4d7
 DIST sam2p-0.45.tar.bz2 434746 RMD160 122e81208f241a7e9d33bddd7df17780b306b305 SHA1 7bba06220ff755c9c68632644afa8ef2f26cab6f SHA256 ed109acb74445e926f39757d7f133b72903d92017da46f8ccb4f26624eb797ff
-EBUILD sam2p-0.45-r1.ebuild 1190 RMD160 87bc1ec71b2c90d39e5289e31379f74c37ba3154 SHA1 7552c54af34cd4acb0cdd889f8f637468130351e SHA256 247ab324c7d317b4d4b7df1b47d94d3dd157d1e0e432a3c7d7a30de9c18b8a15
+EBUILD sam2p-0.45-r1.ebuild 1234 RMD160 35706f3314366f7986d761818efdc0a60ee4c654 SHA1 8311c6d448763840faf367bf5d91bd99dded8ffa SHA256 90ca431774a562f44361348b6087db6e2a41ba9dd0c8bba6c514ab44f3ebba13
 EBUILD sam2p-0.45.ebuild 842 RMD160 7ddf418effff8fb228b8605a6a5dd4e6d15e6e3a SHA1 40cf407a14afeb7b0a7b1da11040a5d3aa95bda7 SHA256 14c270e1b6e155ee688548a461bc9c924897241277dde352de6aae6f7b241e64
-MISC ChangeLog 3849 RMD160 4e658ccce9222bda6337349fd3ed81fb45e47807 SHA1 e8df568de6d82415d5bfff0b849cdd5c345b6e7a SHA256 4ccfcf8c9ba3afe02fc0c3fdaecff682d70bb609f164ffc36f512a4b351f26bc
+MISC ChangeLog 4042 RMD160 88eb95e713e9417d7620e1cf641fde7cd86592bc SHA1 7c548a35ecbea33aafcb72b7d51cab29b03bebb3 SHA256 59772eb4f929acc737f805784296c6d2ec8a2fb8c4c851efd0089a85ac42b27c
 MISC metadata.xml 157 RMD160 e666a9e73ee48e70d6fc6ea78049d38b1fcde7c2 SHA1 43a0c32101f0c6ffd8fa1aa620c8032d194a9e3a SHA256 18238fb417d8677a0495cdaba9b043526174ba63b51494b88b10aa7dd903124c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiwSTsACgkQkKaRLQcq0GK/dwCcCTD39dqoovMlsNVDO6zHyHB8
-SLwAnAp+3nG9txn+c4yPpnk9zsp+7CpF
-=o3A4
+iEYEARECAAYFAki24H0ACgkQvFcC4BYPU0pBSwCgzS0Lw+q+5NOxXo9RQUi0YIIk
+4F0AoMOX7IkFHQ2JBiLlpkk2Y5H43gly
+=ym0q
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/sam2p/files/sam2p-0.45-parallelmake.patch b/media-gfx/sam2p/files/sam2p-0.45-parallelmake.patch
new file mode 100644
index 000000000000..25afcbff808d
--- /dev/null
+++ b/media-gfx/sam2p/files/sam2p-0.45-parallelmake.patch
@@ -0,0 +1,97 @@
+Index: sam2p-0.45/Makefile
+===================================================================
+--- sam2p-0.45.orig/Makefile
++++ sam2p-0.45/Makefile
+@@ -84,47 +84,47 @@ L1_FLAGS=-DCFG_FMT_ZLIB_ONLY=1 -DNDEBUG=
+ TTT_QUOTE=perl -e '$$s=$$_=join"",<STDIN>; $$s=~s@([()\\])@\\$$1@g; die if $$ARGV[0]!~/^(\w+)/; print "\n% TTT_QUOTE\n/$$1 ($$s)\n\n"' --
+ # vvv Dat: input file for `g++ -E' must have .h extension
+ l1g8z.pst: l1zip.psm psmlib.psm ps_tiny
+-	<$< >tmp.h perl -pe0
+-	$(CXX) -E $(L1_FLAGS) -DUSE_A85D=1 tmp.h >tmp.i
+-	<tmp.i >tmp.pin $(PREPROC_STRIP)
+-	<tmp.pin >tmp.ps0 ./ps_tiny
+-	<tmp.ps0 >tmp.pst $(TTT_QUOTE) $@
+-	mv -f tmp.pst $@
++	<$< >$@.tmp.h perl -pe0
++	$(CXX) -E $(L1_FLAGS) -DUSE_A85D=1 $@.tmp.h >$@.tmp.i
++	<$@.tmp.i >$@.tmp.pin $(PREPROC_STRIP)
++	<$@.tmp.pin >$@.tmp.ps0 ./ps_tiny
++	<$@.tmp.ps0 >$@.tmp.pst $(TTT_QUOTE) $@
++	mv -f $@.tmp.pst $@
+ l1ghz.pst: l1zip.psm psmlib.psm ps_tiny
+-	<$< >tmp.h perl -pe0
+-	$(CXX) -E $(L1_FLAGS) -DUSE_HEXD=1 tmp.h >tmp.i
+-	<tmp.i >tmp.pin $(PREPROC_STRIP)
+-	<tmp.pin >tmp.ps0 ./ps_tiny
+-	<tmp.ps0 >tmp.pst $(TTT_QUOTE) $@
+-	mv -f tmp.pst $@
++	<$< >$@.tmp.h perl -pe0
++	$(CXX) -E $(L1_FLAGS) -DUSE_HEXD=1 $@.tmp.h >$@.tmp.i
++	<$@.tmp.i >$@.tmp.pin $(PREPROC_STRIP)
++	<$@.tmp.pin >$@.tmp.ps0 ./ps_tiny
++	<$@.tmp.ps0 >$@.tmp.pst $(TTT_QUOTE) $@
++	mv -f $@.tmp.pst $@
+ l1gbz.pst: l1zip.psm psmlib.psm ps_tiny
+-	<$< >tmp.h perl -pe0
+-	$(CXX) -E $(L1_FLAGS) -DUSE_BINARY=1 tmp.h >tmp.i
+-	<tmp.i >tmp.pin $(PREPROC_STRIP)
+-	<tmp.pin >tmp.ps0 ./ps_tiny
+-	<tmp.ps0 >tmp.pst $(TTT_QUOTE) $@
+-	mv -f tmp.pst $@
++	<$< >$@.tmp.h perl -pe0
++	$(CXX) -E $(L1_FLAGS) -DUSE_BINARY=1 $@.tmp.h >$@.tmp.i
++	<$@.tmp.i >$@.tmp.pin $(PREPROC_STRIP)
++	<$@.tmp.pin >$@.tmp.ps0 ./ps_tiny
++	<$@.tmp.ps0 >$@.tmp.pst $(TTT_QUOTE) $@
++	mv -f $@.tmp.pst $@
+ l1g8l.pst: l1lzw.psm psmlib.psm ps_tiny
+-	<$< >tmp.h perl -pe0
+-	$(CXX) -E $(L1_FLAGS) -DUSE_A85D=1 tmp.h >tmp.i
+-	<tmp.i >tmp.pin $(PREPROC_STRIP)
+-	<tmp.pin >tmp.ps0 ./ps_tiny
+-	<tmp.ps0 >tmp.pst $(TTT_QUOTE) $@
+-	mv -f tmp.pst $@
++	<$< >$@.tmp.h perl -pe0
++	$(CXX) -E $(L1_FLAGS) -DUSE_A85D=1 $@.tmp.h >$@.tmp.i
++	<$@.tmp.i >$@.tmp.pin $(PREPROC_STRIP)
++	<$@.tmp.pin >$@.tmp.ps0 ./ps_tiny
++	<$@.tmp.ps0 >$@.tmp.pst $(TTT_QUOTE) $@
++	mv -f $@.tmp.pst $@
+ l1ghl.pst: l1lzw.psm psmlib.psm ps_tiny
+-	<$< >tmp.h perl -pe0
+-	$(CXX) -E $(L1_FLAGS) -DUSE_HEXD=1 tmp.h >tmp.i
+-	<tmp.i >tmp.pin $(PREPROC_STRIP)
+-	<tmp.pin >tmp.ps0 ./ps_tiny
+-	<tmp.ps0 >tmp.pst $(TTT_QUOTE) $@
+-	mv -f tmp.pst $@
++	<$< >$@.tmp.h perl -pe0
++	$(CXX) -E $(L1_FLAGS) -DUSE_HEXD=1 $@.tmp.h >$@.tmp.i
++	<$@.tmp.i >$@.tmp.pin $(PREPROC_STRIP)
++	<$@.tmp.pin >$@.tmp.ps0 ./ps_tiny
++	<$@.tmp.ps0 >$@.tmp.pst $(TTT_QUOTE) $@
++	mv -f $@.tmp.pst $@
+ l1gbl.pst: l1lzw.psm psmlib.psm ps_tiny
+-	<$< >tmp.h perl -pe0
+-	$(CXX) -E $(L1_FLAGS) -DUSE_BINARY=1 tmp.h >tmp.i
+-	<tmp.i >tmp.pin $(PREPROC_STRIP)
+-	<tmp.pin >tmp.ps0 ./ps_tiny
+-	<tmp.ps0 >tmp.pst $(TTT_QUOTE) $@
+-	mv -f tmp.pst $@
++	<$< >$@.tmp.h perl -pe0
++	$(CXX) -E $(L1_FLAGS) -DUSE_BINARY=1 $@.tmp.h >$@.tmp.i
++	<$@.tmp.i >$@.tmp.pin $(PREPROC_STRIP)
++	<$@.tmp.pin >$@.tmp.ps0 ./ps_tiny
++	<$@.tmp.ps0 >$@.tmp.pst $(TTT_QUOTE) $@
++	mv -f $@.tmp.pst $@
+ # vvv copy the .ttt, not the .tth
+ #     The perl program down there is a portable cat(1) implementation.
+ bts1.ttt: bts.ttt $(L1_LIST)
+@@ -133,7 +133,7 @@ bts2.ttt: bts1.ttt ps_tiny
+ 	./ps_tiny --copy <$< >$@
+ 
+ clean:
+-	rm -f *~ a.out DEADJOE core *.o *.tth .rgd *.rgd tmp.pin tmp.i tmp.ps0 tmp.h tmp.pst autom4te.cache/*
++	rm -f *~ a.out DEADJOE core *.o *.tth .rgd *.rgd *.tmp.pin *.tmp.i *.tmp.ps0 *.tmp.h *.tmp.pst autom4te.cache/*
+ 	rm -f debian/changelog.dch debian/*~ 
+ 	rm -f $(ALL) $(ALL:=.yes) $(ALL:=.no) $(ALL:=.assert) $(ALL:=.checker)
+ 	-rmdir -- autom4te.cache
diff --git a/media-gfx/sam2p/sam2p-0.45-r1.ebuild b/media-gfx/sam2p/sam2p-0.45-r1.ebuild
index 8012a221c1cb..4b962eb7c894 100644
--- a/media-gfx/sam2p/sam2p-0.45-r1.ebuild
+++ b/media-gfx/sam2p/sam2p-0.45-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/sam2p-0.45-r1.ebuild,v 1.6 2008/08/23 17:29:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sam2p/sam2p-0.45-r1.ebuild,v 1.7 2008/08/28 17:29:28 aballier Exp $
 
 inherit toolchain-funcs eutils autotools
 
@@ -23,6 +23,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-fbsd.patch"
 	epatch "${FILESDIR}/${P}-nostrip.patch"
 	epatch "${FILESDIR}/${P}-cflags.patch"
+	epatch "${FILESDIR}/${P}-parallelmake.patch"
 	eautoreconf
 }
 
@@ -33,7 +34,7 @@ src_compile() {
 		die "disable FEATURES=distcc"
 	fi
 	econf --enable-lzw $(use_enable gif) || die "econf failed"
-	emake -j1 || die "make failed"
+	emake || die "make failed"
 }
 
 src_install() {