Bug #193258 reported some parallel make failures for complex cases. The original patch with that was not however suitable, so take the much simplier patch that Fedora did instead.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 76 insertions, 12 deletions

diff --git a/sys-devel/make/ChangeLog b/sys-devel/make/ChangeLog
index db9205b9bc29..578fd70ed9a1 100644
--- a/sys-devel/make/ChangeLog
+++ b/sys-devel/make/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/make
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/ChangeLog,v 1.62 2010/02/13 08:48:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/ChangeLog,v 1.63 2010/03/31 22:42:05 robbat2 Exp $
+
+*make-3.81-r2 (31 Mar 2010)
+
+  31 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> +make-3.81-r2.ebuild,
+  +files/make-3.81-jobserver.patch:
+  Bug #193258 reported some parallel make failures for complex cases. The
+  original patch with that was not however suitable, so take the much
+  simplier patch that Fedora did instead.
 
   13 Feb 2010; Mike Frysinger <vapier@gentoo.org>
   files/make-3.81-long-cmdline.patch:
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index 2cbff9326007..8c06bfd87420 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 3.80-memory.patch 2248 RMD160 3c8d5c017c61061eb4d6f666799d377f1ba272ca SHA1 9e3f3d9c9fa7911dff14adbe46080e1326cf05f2 SHA256 0fa6d8b039fd56313626a3865cde7ef09622525a751ec55bf3741a6fc172091f
 AUX make-3.80-conditional-eval.patch 4144 RMD160 f8755c6ea82cfc4cdc6675b2e462fb6438b9e569 SHA1 3320a4196e42a25a3f7f51a3f84859c49dea6683 SHA256 68f182f5435296b60acc710006bddf745bee6c37e68ae2942c778add93a40155
 AUX make-3.80-parallel-build-failure.patch 2210 RMD160 5c7fe016fc854b017315bf22c6ddc1c600d4b99a SHA1 0b3f318ccf89aa660a0cc33c179bc58a62fbe378 SHA256 71f80dee56a04f30f2fe8bb9012d32ed830d2e0e9f68c183819c5ccf025c9b62
+AUX make-3.81-jobserver.patch 515 RMD160 93a2f70cd9f458a435487fa15bf26884e5e97dcc SHA1 9202b408fca65d9855e5ebd750371ebe82f40b8a SHA256 617171f579c3b757f176873cb42ab1c68b941bbc825446fcadd44ba81a9dd8af
 AUX make-3.81-long-cmdline.patch 2823 RMD160 264e25b6c85ca9a68167e82c6c10a812852b2124 SHA1 226990c39bbf67e2d1d523eb41fa337fd48390b0 SHA256 0609897c53f29fca55b0f064a45af881cb1c98297c5c7f43e0bde154622f3c26
 AUX make-3.81-tests-lang.patch 1788 RMD160 c62f231b9bb5fef003e91f9a48b76832bd75b72d SHA1 2d77b19cafa2a24a840af3b7418399b7ee696ee2 SHA256 0d2f6b061ed2b09babbb851d1bcebcd20bc2331c799d469bfefa2a985774e486
 DIST make-3.80.tar.bz2 920645 RMD160 dcb61f3913d4d43caeef5b597ba2d4e1a03701aa SHA1 d2085842f08e57d58d3e1cd75a5f0342a60e5f45 SHA256 a99b39e7b04c333724f48c38fede709481cfb69fafe7e32ae4285b7fadf92f1b
 DIST make-3.81.tar.bz2 1151445 RMD160 79d418e1258ec0d6ba08b1431a4ade3fec54c2b2 SHA1 41ed86d941b9c8025aee45db56c0283169dcab3d SHA256 f3e69023771e23908f5d5592954d8271d3d6af09693cecfd29cee6fde8550dc8
 EBUILD make-3.80-r4.ebuild 1140 RMD160 8b378fd1bf71d892ad072a3e14bc3d5ab73b6e29 SHA1 e4556c756032747e36c1638737fa6921087db668 SHA256 9dca642ab97bb823a6cd85aa0757bb7c88636f4cddd7f3323c8f4da394ce7667
 EBUILD make-3.81-r1.ebuild 1203 RMD160 f6ece9102a0de446627b53876eabb85146b9552c SHA1 43bfe2cff05022e888c727b64c2c224f12909cd7 SHA256 024b90510c3e3e29c205b79146bbdb881e882939a5b4cbd6b4637225cfdebc1f
+EBUILD make-3.81-r2.ebuild 1326 RMD160 6baa2392877b0a905a6685f1fbdb732db6e90e37 SHA1 4c887593dbef4b7e77a07a9dd9463af97aed9f5b SHA256 f0e6e79291b2148c9de122610dca53c053ac1daff6f9fb6e5dbac5672f0c0306
 EBUILD make-3.81.ebuild 1134 RMD160 425a6c02111d11a5a37f5925d61cfd7eca056738 SHA1 38775d52c06b6d850e2ca9e492c7f2ce197e7992 SHA256 f75601a66102b975d9dcf04517087f4a7393bc06d70432eb121ec205dabb846d
-MISC ChangeLog 7504 RMD160 9e7337ef33125c84efa60f16cd6ff7cace0b4dd3 SHA1 fa673f2f232cdd8ca9db2d951c74ad397661cbcb SHA256 166dabc7d60971077e1ebb4de201fe78cab677f38e59bce062b630f3651b3fe3
+MISC ChangeLog 7832 RMD160 430f407dbaa7815db1d0a4f56b57843b4b70e8db SHA1 bf0d1b3568ad4a85391e962a42965e565e216081 SHA256 9236646429aaf7da0e4dda9785137be55856f24f1280678a803bdf1d6c59a6bb
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iF4EAREIAAYFAkt2Z3AACgkQTwhj9JtAlp7TygD+M84W2hlvVVtoYi/mtmio0q/W
-1Hz051H3YpXNxFNMTlIBAKoLzcjjvsF4GwXmVUhaNk2FPNJT6uiemxxlZkSwZtgW
-=1+0l
------END PGP SIGNATURE-----
diff --git a/sys-devel/make/files/make-3.81-jobserver.patch b/sys-devel/make/files/make-3.81-jobserver.patch
new file mode 100644
index 000000000000..df651079bfab
--- /dev/null
+++ b/sys-devel/make/files/make-3.81-jobserver.patch
@@ -0,0 +1,18 @@
+diff -urp make-3.81/main.c make-3.81-pm/main.c
+--- make-3.81/main.c	2007-09-24 15:28:34.000000000 +0200
++++ make-3.81-pm/main.c	2007-09-24 15:32:50.000000000 +0200
+@@ -1669,8 +1669,12 @@ main (int argc, char **argv, char **envp
+ 
+     if (job_slots > 0)
+       {
+-        close (job_fds[0]);
+-        close (job_fds[1]);
++	if (restarts == 0)
++	  {
++	    close (job_fds[0]);
++	    close (job_fds[1]);
++	  }
++
+         job_fds[0] = job_fds[1] = -1;
+         free (jobserver_fds->list);
+         free (jobserver_fds);
diff --git a/sys-devel/make/make-3.81-r2.ebuild b/sys-devel/make/make-3.81-r2.ebuild
new file mode 100644
index 000000000000..c5000424e443
--- /dev/null
+++ b/sys-devel/make/make-3.81-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.81-r2.ebuild,v 1.1 2010/03/31 22:42:05 robbat2 Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="Standard tool to compile source trees"
+HOMEPAGE="http://www.gnu.org/software/make/make.html"
+SRC_URI="mirror://gnu//make/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="nls static"
+
+DEPEND="nls? ( sys-devel/gettext )"
+RDEPEND="nls? ( virtual/libintl )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-tests-lang.patch
+	epatch "${FILESDIR}"/${P}-long-cmdline.patch #301116
+	# related to bug #193258, but this is the final patch that Fedora went with.
+	epatch "${FILESDIR}"/${P}-jobserver.patch 
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	econf \
+		$(use_enable nls) \
+		--program-prefix=g \
+		|| die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README*
+	if [[ ${USERLAND} == "GNU" ]] ; then
+		# we install everywhere as 'gmake' but on GNU systems,
+		# symlink 'make' to 'gmake'
+		dosym gmake /usr/bin/make
+		dosym gmake.1 /usr/share/man/man1/make.1
+	fi
+}