Fix concurrent build of v86d (bugs #238506, #238714).

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.27-rc6 x86_64

4 files changed, 62 insertions, 8 deletions

diff --git a/sys-apps/v86d/ChangeLog b/sys-apps/v86d/ChangeLog
index d539f50f8897..bf9f64cbd5e7 100644
--- a/sys-apps/v86d/ChangeLog
+++ b/sys-apps/v86d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/v86d
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/v86d/ChangeLog,v 1.23 2008/09/21 19:33:54 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/v86d/ChangeLog,v 1.24 2008/09/27 20:02:32 spock Exp $
+
+  27 Sep 2008; Michał Januszewski <spock@gentoo.org>
+  +files/v86d-0.1.8-concurrent-make.patch, v86d-0.1.8.ebuild:
+  Fix concurrent build of v86d (bugs #238506, #238714).
 
 *v86d-0.1.8 (21 Sep 2008)
 
diff --git a/sys-apps/v86d/Manifest b/sys-apps/v86d/Manifest
index 434d6b936ad6..f68e1fc02335 100644
--- a/sys-apps/v86d/Manifest
+++ b/sys-apps/v86d/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX v86d-0.1.8-concurrent-make.patch 1233 RMD160 f1de30dd01c9a5578a013f329a0ea5bbfb2c1cdf SHA1 9488570bf4a3f2765fbcd226980fec655e8b2cb0 SHA256 aac841e238ecd5f38f3da25808ec59ee67266788669d74fd9034cfb32e689754
 DIST v86d-0.1.3.tar.bz2 67044 RMD160 717aa7b043979bc9aa3fd702bd656fa9c473dcd8 SHA1 372b20cc10e8435343b05dc197d30721eb3faa61 SHA256 bf0ca221bc5e8a6b06f73a1eb6ae1470ec5b34b987669f7abeb499e6402af3b0
 DIST v86d-0.1.5.2.tar.bz2 67683 RMD160 fc27119254c66335adbfb66c9d6cc208944aaa37 SHA1 58b75d41bce351b4b3256d0b31018247b18665bf SHA256 f2550a79f74f589a7092b4a0c941cfec8df12883095669d06a38924c5c0a3e46
 DIST v86d-0.1.6.tar.bz2 69354 RMD160 e2da60c8bfa8595710803fd9f0ca1b835d04b4d5 SHA1 502265f20ef899d90c3cf6c4eb53039c0ec3938a SHA256 21332eafa857ee934f791fb2f1731547ef51c7f59dbb251ac680e70ae9e901bd
@@ -10,13 +11,13 @@ EBUILD v86d-0.1.3-r1.ebuild 1330 RMD160 0b0855b1b197e8c16ecc512fa86824d527312060
 EBUILD v86d-0.1.5.2.ebuild 1349 RMD160 5233af8aa230daff7fd2a6b9273f66d99e74be86 SHA1 369c81058a3659b1c8f70064c21bc57d3898130c SHA256 f33ba86baf9ffd7dac2916119f860ce9ff0d2302e4abbf4fc9ad98f73e0c9fc2
 EBUILD v86d-0.1.6.ebuild 1347 RMD160 c8a781cd5ad54b1d7967b9d090457ab3e6a46973 SHA1 560ac193907117661c7bf33a5457c24227303159 SHA256 48d276ca6ed13211d68a87a6975efca8e0bd97bc7f36950811412e2a6667082f
 EBUILD v86d-0.1.7.ebuild 1349 RMD160 5c3e2d043c5d802ddb3545b9a74469efb6d4ed78 SHA1 255052659574afef42919d4a91e908e7517977c5 SHA256 dc1f0e9125a52207b5ae5cecdfae29dd31a7c302a80454ec246375bec2652c27
-EBUILD v86d-0.1.8.ebuild 1289 RMD160 1e99215eb058c5862b8fd1a9f7aca4516d27751d SHA1 d1748f1365e2b351814270c2de3ed429bc79fde2 SHA256 774338ccd48e88618af6ed2c2667462be71834a2841a66945a4f9bc86a9b2382
-MISC ChangeLog 3128 RMD160 a3440f374545ef1e3075450db1c9abe6945b7c54 SHA1 69cafd1237080a854de4e14a3511c0dc3fe92ab3 SHA256 1706c5b70b3861083c896db69ec1db0918390a41378bd35f736df59c4a033517
+EBUILD v86d-0.1.8.ebuild 1387 RMD160 771916138c5e7036e6b0b7e5d4cb9cb906c2d2f8 SHA1 4d198318eaf3ba7f44288599d51f1957a321356e SHA256 9f62a6a4c0952beab44e5e191489bfc2af9d9ca11e297afe0b10a80640759fc4
+MISC ChangeLog 3301 RMD160 467d56dececefece68a0c08be9eb22a61dea0ceb SHA1 c457e54b6f26cd4110a0f70089b14120670788d0 SHA256 8e1567e35c035c74f3c6e2260d9ad692b938910adc2e2390bc0ca5981060b463
 MISC metadata.xml 293 RMD160 baa7275aad4d516d2ca2b2cd73cee55bbfca727a SHA1 485ccf88eeb2a9790eae473b9159ebca4df47826 SHA256 2adac1f8fca7b6ffc89212bebc389e621ba16e16d3185f468a064bb78ef1f6c0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjWoXMACgkQchej4aZK9/dMRQCdEeOU07dfSleLU8wRNNpxzgqp
-q+4AoITZSGdBgwc+ENbXP1/kXoJBVAym
-=SXyG
+iEYEARECAAYFAkjekSEACgkQchej4aZK9/chrgCdGYMAMsQvjDYIGIDIF4JzjKwx
+aiAAnRZjOqMWJuVKEHTMew6l+4O7gicK
+=txiD
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/v86d/files/v86d-0.1.8-concurrent-make.patch b/sys-apps/v86d/files/v86d-0.1.8-concurrent-make.patch
new file mode 100644
index 000000000000..1a969d67f7fc
--- /dev/null
+++ b/sys-apps/v86d/files/v86d-0.1.8-concurrent-make.patch
@@ -0,0 +1,43 @@
+diff -Naurp v86d-0.1.8-orig/Makefile v86d-0.1.8/Makefile
+--- v86d-0.1.8-orig/Makefile	2008-09-27 21:52:56.000000000 +0200
++++ v86d-0.1.8/Makefile	2008-09-27 21:53:50.000000000 +0200
+@@ -17,13 +17,13 @@ ifeq ($(call config_opt,CONFIG_X86EMU),t
+ 	CFLAGS += -Ilibs/x86emu
+ 	LDFLAGS += -Llibs/x86emu
+ 	LDLIBS += -lx86emu
+-	V86OBJS = v86_x86emu.o v86_mem.o
++	V86OBJS = v86_x86emu.o v86_mem.o v86_common.o
+ 	V86LIB = x86emu
+ else
+ 	CFLAGS += -Ilibs/lrmi-0.10
+ 	LDFLAGS += -Llibs/lrmi-0.10 -static
+ 	LDLIBS += -llrmi
+-	V86OBJS = v86_lrmi.o
++	V86OBJS = v86_lrmi.o v86_common.o
+ 	V86LIB = lrmi
+ endif
+ 
+@@ -40,17 +40,17 @@ all: $(V86LIB) v86d $(DEBUG_BUILD)
+ %.o: %.c v86.h
+ 	$(CC) $(CFLAGS) -c -o $@ $<
+ 
+-v86d: v86.o v86_common.o $(V86OBJS)
+-	$(CC) $(LDFLAGS) $+ $(LDLIBS) -o $@
++v86d: $(V86OBJS) $(V86LIB) v86.o
++	$(CC) $(LDFLAGS) $(V86OBJS) v86.o $(LDLIBS) -o $@
+ 
+-testvbe: testvbe.o v86_common.o $(V86OBJS)
+-	$(CC) $(LDFLAGS) $+ $(LDLIBS) -o $@
++testvbe: $(V86OBJS) $(V86LIB) testvbe.o
++	$(CC) $(LDFLAGS) $(V86OBJS) testvbe.o $(LDLIBS) -o $@
+ 
+ x86emu:
+-	make -w -C libs/x86emu
++	$(MAKE) -w -C libs/x86emu
+ 
+ lrmi:
+-	make -e -w -C libs/lrmi-0.10 liblrmi.a
++	$(MAKE) -e -w -C libs/lrmi-0.10 liblrmi.a
+ 
+ clean:
+ 	rm -rf *.o v86d testvbe
diff --git a/sys-apps/v86d/v86d-0.1.8.ebuild b/sys-apps/v86d/v86d-0.1.8.ebuild
index 55465fd78ccc..38e4f6d939d0 100644
--- a/sys-apps/v86d/v86d-0.1.8.ebuild
+++ b/sys-apps/v86d/v86d-0.1.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/v86d/v86d-0.1.8.ebuild,v 1.1 2008/09/21 19:33:54 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/v86d/v86d-0.1.8.ebuild,v 1.2 2008/09/27 20:02:32 spock Exp $
 
-inherit linux-info multilib
+inherit eutils linux-info multilib
 
 DESCRIPTION="A daemon to run x86 code in an emulated environment."
 HOMEPAGE="http://dev.gentoo.org/~spock/projects/uvesafb/"
@@ -27,6 +27,12 @@ pkg_setup() {
 	linux-info_pkg_setup
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-concurrent-make.patch"
+}
+
 src_compile() {
 	./configure --with-klibc $(use_with debug) $(use_with x86emu)
 	make KDIR="${KV_DIR}" || die