Fix parallel builds in the tc subdir.

Package-Manager: portage-2.2.0_alpha65/cvs/Linux x86_64

4 files changed, 56 insertions, 10 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index 6d7e837276b2..63f70f3b5bc9 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.173 2011/07/31 18:33:22 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.174 2011/10/18 21:41:55 vapier Exp $
+
+  18 Oct 2011; Mike Frysinger <vapier@gentoo.org> iproute2-2.6.38.ebuild,
+  +files/iproute2-2.6.38-parallel-build.patch:
+  Fix parallel builds in the tc subdir.
 
   31 Jul 2011; Matt Turner <mattst88@gentoo.org> iproute2-2.6.29.1-r1.ebuild,
   iproute2-2.6.35-r2.ebuild, iproute2-2.6.35-r3.ebuild, iproute2-2.6.38.ebuild,
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 6d7098fabe9a..c32ac559d112 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX iproute2-2.6.26-ldflags.patch 330 RMD160 0dd7dd7837120eb31ffc8b9650063c4f8c8f8889 SHA1 a2dead0f194cfa039ecab330b0a945748f894948 SHA256 c7206270a72a9e0aa66ddf641d10a384501e58b87917b1e3161f297349b8ec13
 AUX iproute2-2.6.29.1-flush.patch 5669 RMD160 63441945760ddaa5de5678934fc5e2d2a7f960f0 SHA1 289383e5d198e33992eda9984bdd2fea1071a894 SHA256 13007eb0335e4a8a88f4946cea9fc61ee4fbe840ce308279696212b11aa1928a
@@ -8,20 +8,21 @@ AUX iproute2-2.6.35-cached-routes.patch 973 RMD160 ebfce18a197c7e523801752797c01
 AUX iproute2-2.6.35-no-iptables.patch 320 RMD160 9e009b47a903a4977e63dd0d95962b332a619e6c SHA1 f28aa08df317e3855c1dae0d45018e441e005b85 SHA256 b63d367005b9a86ef68634d657242e1abd58a9f8d5eb58e8beea97f7b8cfe666
 AUX iproute2-2.6.35-no-ipv6.patch 859 RMD160 5e3760d4a9cbd9a74be4b66fbd08e272f49e86b3 SHA1 7c5c1e5e3ead449dd99ad00bf5725d3e785dc213 SHA256 643429d9dca71e505bf3ab5a8e35a89b1014cd4ffec2f77e0abc1fd3997579d3
 AUX iproute2-2.6.35-xtables.patch 1027 RMD160 ba09b7f3fc7d6b38c1321ec6f43089679e6e3ebe SHA1 985aba3c19d085230e97c3e7aee64eff5c86d9b3 SHA256 4f2227b31407002dcad8d547fe61e8b5aaba7b70a11ea20b9bfb9583ac105801
+AUX iproute2-2.6.38-parallel-build.patch 1191 RMD160 d007fece03f344dc0a1901482a815507d4c24f56 SHA1 56d810756f09696997871c0fb44778f12da6cdba SHA256 fe3cb7e51398c6f6929e93ea03a822ed404d0e1cb302f4ca9e8fcb350b1abf18
 DIST iproute2-2.6.29-1.tar.bz2 367905 RMD160 f96c3ec0877c9d5a2dcba582b399a80ed71a4a8b SHA1 b6a43799bf5e8131307cf88b855031317af90eb4 SHA256 13ffb0ffe5404c9dcc8bed8c692f07d934aa3fd44661df79dd1efbb37f83fb9b
 DIST iproute2-2.6.35.tar.bz2 387193 RMD160 39a4eb0b07fa5b1ddbfc9f31f4053a5e777e8b97 SHA1 862b86ac73ea696867675765d119654553a22aeb SHA256 8ab2f47e129925fb8acb09421008d07aeafa01b2ddd1fcba4a056de079f090a3
 DIST iproute2-2.6.38.tar.bz2 390166 RMD160 7c59dab852cd4c6eb685ac778c1e27d7e59d9b6f SHA1 e9f6d457a06866a2a20a6cba6b3a039b2ec3e14a SHA256 47629a4f547f21d94d8e823a87dd8e13042cadecefea2e2dc433e4134fa9aec4
 EBUILD iproute2-2.6.29.1-r1.ebuild 2737 RMD160 390ab7a08c245e50b6ce69766a812225b52c4bb5 SHA1 417f0dcb0720eb0d878ffe583a391512cefb887f SHA256 3652c262e52359e898b74f3eb428ceb9690c3d6b08c76654c7b35a5933695e40
 EBUILD iproute2-2.6.35-r2.ebuild 2611 RMD160 d35ca09dedb9eaff75703cbd1f15c0eaabb3b9e1 SHA1 9938aa61a7ba97cce8007502cf183d95cf60b62d SHA256 5f14ab7b77672d49df8e9648975613cde048220c915670cdc4adb0610b54fcd8
 EBUILD iproute2-2.6.35-r3.ebuild 2881 RMD160 32368f70d63f5675681df3fcb405d141b20d7272 SHA1 479bded179abf64ba1dae27c8cef1b38ea8dc7a9 SHA256 de74bd52f5e4c975030e74072f8651b12d91af7076e111b44cc399097fdfb1b9
-EBUILD iproute2-2.6.38.ebuild 2416 RMD160 a74f462cbf8bf5525280873efe3ec55e8755baa6 SHA1 c7132c99b506dd48bd67eb670e7739cca40c7c47 SHA256 ea2b39b06066f24f70bf5e7712988717c7e6b959d4d9023296c62c324fb1dc51
+EBUILD iproute2-2.6.38.ebuild 2463 RMD160 a02158a4b773dcd43dfc888405b0531bfc613ebe SHA1 d28c9051a48b4614100addd4bfe2b5eb5bf6f82b SHA256 d7ec4a6b3c6ce80fa6520c95450d5d0592099103692c97bc0f3d16c5a918a660
 EBUILD iproute2-9999.ebuild 2415 RMD160 062ab30a53b38a88611df2d19448c6836f50f241 SHA1 e61653bfed9573eebf0886847213b691f5981a75 SHA256 fafe36398968cb44d8de8172484255b0cda22574e2c7cdc35c3cebf55ffbe4d3
-MISC ChangeLog 30677 RMD160 e06e646f5b0161b076714062afe5fab2ec8c797b SHA1 dd03f27fd19818c7d2c12a549582def10b45854d SHA256 7c0b7fdd3286dc314b3e85ef3bc43f4e69b85ed0a4ddf9e765a0d02eb7b53134
+MISC ChangeLog 30837 RMD160 9bb807146fa581b8f0d02ffccc0f4a66abfef127 SHA1 fb510878b53b136197b6314ae5945e22df676623 SHA256 103e9b5580bec8165d5da5bfd7a6ded88a58bbcf57fb0ef1b721711e493476c7
 MISC metadata.xml 246 RMD160 f577c668ed7c33423595f7d3db200a5868749b60 SHA1 7727cd7938065c32bef28eee0e3ef096125217e1 SHA256 f081ffa604caba81f8229deeec7b8d4694d83c059564d7c941f7b942b8385012
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk41n/gACgkQTVUdg23rv521gQCdE74HZCNWpD9vUlVCu4zWGUIZ
-60IAn3GirEyn3+M2rKkCItfvvmUnlpcj
-=5v7Y
+iF4EAREIAAYFAk6d8qoACgkQaC/OocHi7JY/AwD+PepJ4waC4CbTPBAyxk2DUdg5
+XVuvvMwb0WwLp5yKIr8BAJnjUr67icwkFutGeGjHmnwbumG6w1UJVtu42T6lAkGW
+=Auxs
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/files/iproute2-2.6.38-parallel-build.patch b/sys-apps/iproute2/files/iproute2-2.6.38-parallel-build.patch
new file mode 100644
index 000000000000..7966cfce5044
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-2.6.38-parallel-build.patch
@@ -0,0 +1,40 @@
+sent upstream already
+
+From f8a783bbe98b0fe5aaedbf623bc70471b88c9187 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 18 Oct 2011 17:36:55 -0400
+Subject: [PATCH] tc: fix parallel build file with lex/yacc
+
+Building iproute2 in parallel might hit the race failure:
+	emp_ematch.l:2:30: fatal error: emp_ematch.yacc.h:
+		No such file or directory
+	make[1]: *** [emp_ematch.lex.o] Error 1
+
+This is because we currently allow the yacc/lex files to generate and
+compile in parallel.  So add a simple dependency to make sure yacc has
+finished before we attempt to compile the lex output.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ tc/Makefile |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/tc/Makefile b/tc/Makefile
+index 08aa4ce..b2ca165 100644
+--- a/tc/Makefile
++++ b/tc/Makefile
+@@ -136,6 +136,11 @@ m_xt_old.so: m_xt_old.c
+ %.lex.c: %.l
+ 	$(LEX) $(LEXFLAGS) -o$@ $<
+ 
++# our lexer includes the header from yacc, so make sure
++# we don't attempt to compile it before the header has
++# been generated as part of the yacc step.
++emp_ematch.lex.o: emp_ematch.yacc.c
++
+ ifneq ($(SHARED_LIBS),y)
+ 
+ tc: static-syms.o
+-- 
+1.7.6.1
+
diff --git a/sys-apps/iproute2/iproute2-2.6.38.ebuild b/sys-apps/iproute2/iproute2-2.6.38.ebuild
index d812041623e6..9a04fe7c566a 100644
--- a/sys-apps/iproute2/iproute2-2.6.38.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.38.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.38.ebuild,v 1.2 2011/07/31 18:33:22 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.38.ebuild,v 1.3 2011/10/18 21:41:55 vapier Exp $
 
 EAPI=4
 
@@ -38,7 +38,8 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.6.29.1-hfsc.patch" #291907
+	"${FILESDIR}"/${PN}-2.6.29.1-hfsc.patch #291907
+	"${FILESDIR}"/${PN}-2.6.38-parallel-build.patch
 )
 
 src_prepare() {