Fix parallel make in modglue.

(Portage version: 2.2_rc67/git/Linux i686)
 (Unsigned Manifest commit)

4 files changed, 62 insertions, 2 deletions

diff --git a/sci-libs/modglue/ChangeLog b/sci-libs/modglue/ChangeLog
index ce3223317..1395b45de 100644
--- a/sci-libs/modglue/ChangeLog
+++ b/sci-libs/modglue/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Aug 2010; François Bissey <f.r.bissey@massey.ac.nz>
+  modglue-1.16.ebuild, +files/modglue-1.16-parallelmake.patch:
+  Fix parallel make.
+
   20 Aug 2010; François Bissey <f.r.bissey@massey.ac.nz>
   modglue-1.16.ebuild, +files/modglue-1.16-lib64.patch:
   Keyword ~amd64 and apply a band aid patch for it.
diff --git a/sci-libs/modglue/Manifest b/sci-libs/modglue/Manifest
index 8ee021bfc..e3088f40b 100644
--- a/sci-libs/modglue/Manifest
+++ b/sci-libs/modglue/Manifest
@@ -1,6 +1,7 @@
 AUX modglue-1.16-ldflags.patch 687 RMD160 32369f6aebc57f065dffc41942e45f4b9e67896f SHA1 5376c23d2d3115b08efb8e13b5ba7f794231d541 SHA256 be2c3788f96a99a101421fc5ee4ac49d3bfcdd5b5056fcd466cc4e3d6db8dcf7
 AUX modglue-1.16-lib64.patch 1856 RMD160 83804e36e1175485089c18bfa06e8687411bb27b SHA1 b4572600aa9ce045f010448c5926417d5eedd0cf SHA256 1a8b79cee1ec35d094e033a9aa84f017d9ccce26812ffcb17869629e1142ae66
+AUX modglue-1.16-parallelmake.patch 1475 RMD160 57d087fa3d8cda09bf9bc420a01196e928f5c4c5 SHA1 1deb19735157281c22b8f17251c67f4053917c92 SHA256 110d385e42b4013b0cf8cdb1c7b74d1c103e12ad79eb7264b367d6a126b8e5ec
 DIST modglue-1.16.tar.gz 89987 RMD160 46e0ee58004dfbdcc34862d73ec85d699b2dece0 SHA1 3f47c261c81fdd0ff4ba2dc7958dd4d83dcffd1b SHA256 1da62910d7171cb5547c0757c366e5338f889c0155c33375e891df75e2ee429e
-EBUILD modglue-1.16.ebuild 1103 RMD160 c25a0fe51392f2b76e4b8fb9dbb3e413d2b88f93 SHA1 632045a3eccc0ef0e8da0bd21617d16f9858d4af SHA256 88205f818cb8428bf51e763644da3d34628b330afb53412528777154ab43607d
-MISC ChangeLog 954 RMD160 d7c10b20312cb577253d49936e629d2cbddf3b09 SHA1 9f65a2e84a950734abadeeaffc1416cf917d66b5 SHA256 541053b75787fffcb1d79ba67ee1cebcbdc112cc2c7182ce4b32a1744423986d
+EBUILD modglue-1.16.ebuild 1219 RMD160 cd51bc2cf4f61c0b51c55313cf4662d09508e023 SHA1 7262edc2536e6b24e3e4370a72321c09700e94f5 SHA256 7ed5efec2207c687f5d48f3d0f3bd90da98fe0850de335fb44b365e39d6ef673
+MISC ChangeLog 1097 RMD160 6a346adcae032f7b3328c1737ab74d3f8254674a SHA1 feb07a8bc92e982073cbfb51b49c2aaafcd58d8e SHA256 f4e5d2c85d54a10d0b0a57bdf2efa5104e8aabf00919132f15abe4e7645d9e18
 MISC metadata.xml 885 RMD160 34165bffafd7c55b7d84155b39bd32a1251e6aa7 SHA1 6386d45d76662564b2f064fe1379d7cf69b83c3f SHA256 930e55dd4ad9b6e93ca69134cd181210c6bf6c114a4b9a7a6200ea47ee465eb4
diff --git a/sci-libs/modglue/files/modglue-1.16-parallelmake.patch b/sci-libs/modglue/files/modglue-1.16-parallelmake.patch
new file mode 100644
index 000000000..b6d675084
--- /dev/null
+++ b/sci-libs/modglue/files/modglue-1.16-parallelmake.patch
@@ -0,0 +1,53 @@
+--- Makefile.in.orig	2010-08-21 22:04:51.877629329 +1200
++++ Makefile.in	2010-08-21 22:06:12.887628815 +1200
+@@ -7,7 +7,7 @@
+ #examples
+ 
+ library:
+-	( cd src && $(MAKE) );
++	( cd src && $(MAKE) library tools );
+ 
+ static:
+ 	( cd src && $(MAKE) static );
+--- src/Makefile.in.orig	2010-08-21 22:05:26.411630332 +1200
++++ src/Makefile.in	2010-08-21 22:08:20.961629492 +1200
+@@ -49,21 +49,21 @@
+ 
+ #------- Tests ----------------------------------------
+ 
+-test_child_process: test_child_process.o
++test_child_process: library test_child_process.o
+ 	${MPHASE} -o test_child_process $< libmodglue.la
+ 
+-test_ext_process: test_ext_process.o
++test_ext_process: library test_ext_process.o
+ 	${MPHASE} -o test_ext_process $< libmodglue.la
+ 
+-test_pipe: test_pipe.o
++test_pipe: library test_pipe.o
+ 	${MPHASE} -o test_pipe $< libmodglue.la
+ 
+-test_writes: test_writes.o
++test_writes: library test_writes.o
+ 	${MPHASE} -o test_writes $< libmodglue.la
+ 
+ #------- Tools ----------------------------------------
+ 
+-prompt: prompt.o
++prompt: library prompt.o
+ 	${MPHASE} -o prompt prompt.o `pkg-config sigc++-2.0 --libs` libmodglue.la 
+ 
+ prompt_static: prompt.cc library
+@@ -77,10 +77,10 @@
+ endif
+ 
+ 
+-ptywrap: ptywrap.o
++ptywrap: library ptywrap.o
+ 	${MPHASE} -o ptywrap ptywrap.o @LINK_UTIL@
+ 
+-ptywrap_static: ptywrap.o
++ptywrap_static: library ptywrap.o
+ 	${CPHASE} ${TIMESTAMP} -o ptywrap.o \
+           -I@top_srcdir@/include -DSTATICBUILD ptywrap.cc
+ ifeq ($(strip $(MACTEST)),)
diff --git a/sci-libs/modglue/modglue-1.16.ebuild b/sci-libs/modglue/modglue-1.16.ebuild
index f27a192de..1acd900bd 100644
--- a/sci-libs/modglue/modglue-1.16.ebuild
+++ b/sci-libs/modglue/modglue-1.16.ebuild
@@ -23,6 +23,8 @@ RDEPEND=">=dev-libs/libsigc++-2.0"
 src_prepare() {
 	# Respect LDFLAGS
 	epatch "${FILESDIR}"/${P}-ldflags.patch
+	# fix parallel make. test are made at the same time as the library??
+	epatch "${FILESDIR}"/${P}-parallelmake.patch
 	# take care of the lib/lib64 problem. Without this modglue installs
 	# stuff in /usr/usr/lib64 on 64bits systems.
 	# FIXME: there has to be a better way to handle this!