diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/systemd/systemd-204.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/systemd/systemd-204.ebuild index ad4a2a0a51..515faaf0dd 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/systemd/systemd-204.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/systemd/systemd-204.ebuild @@ -63,6 +63,7 @@ DEPEND="${COMMON_DEPEND} dev-util/gperf >=dev-util/intltool-0.50 >=sys-devel/gcc-4.6 + >=sys-devel/make-3.82-r4 >=sys-kernel/linux-headers-${MINKV} virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.18 )" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/ChangeLog b/sdk_container/src/third_party/portage-stable/sys-devel/make/ChangeLog new file mode 100644 index 0000000000..218fb11202 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/ChangeLog @@ -0,0 +1,418 @@ +# ChangeLog for sys-devel/make +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/ChangeLog,v 1.115 2013/02/19 03:00:42 zmedico Exp $ + + 19 Feb 2013; Zac Medico make-3.82-r4.ebuild: + Add ~arm-linux keyword. + + 28 Jan 2013; Alexis Ballier make-3.82-r4.ebuild: + keyword ~amd64-fbsd, it seems I did not keyword the latest version... + + 01 Jan 2013; Raúl Porcel make-3.82-r4.ebuild: + m68k/s390/sh stable wrt #441528 + + 30 Dec 2012; Agostino Sarubbo make-3.82-r4.ebuild: + Stable for alpha, wrt bug #441528 + + 29 Dec 2012; Agostino Sarubbo make-3.82-r4.ebuild: + Stable for sparc, wrt bug #441528 + + 17 Dec 2012; Agostino Sarubbo make-3.82-r4.ebuild: + Stable for ia64, wrt bug #441528 + + 16 Dec 2012; Agostino Sarubbo make-3.82-r4.ebuild: + Stable for x86, wrt bug #441528 + + 14 Dec 2012; Jeroen Roovers make-3.82-r4.ebuild: + Stable for HPPA (bug #441528). + + 12 Dec 2012; Agostino Sarubbo make-3.82-r4.ebuild: + Stable for amd64, wrt bug #441528 + + 09 Dec 2012; Agostino Sarubbo make-3.82-r4.ebuild: + Stable for ppc64, wrt bug #441528 + + 09 Dec 2012; Markus Meier make-3.82-r4.ebuild: + arm stable, bug #441528 + + 09 Dec 2012; Agostino Sarubbo make-3.82-r4.ebuild: + Stable for ppc, wrt bug #441528 + + 17 Oct 2012; Christoph Junghans + +files/make-3.82-darwin-library_search-dylib.patch, make-3.82-r4.ebuild: + added prefix support (bug #434514) + + 05 Oct 2012; Mike Frysinger + +files/make-3.82-construct-command-line.patch, + +files/make-3.82-intermediate-parallel.patch, + +files/make-3.82-long-command-line.patch, -files/make-3.82-long-cmdline.patch, + make-3.82-r4.ebuild: + Add some more fixes from upstream #431250 by Vladimir. + + 02 Sep 2012; Raúl Porcel make-3.82-r3.ebuild: + alpha/ia64/m68k/s390/sh/sparc stable wrt #419941 + + 11 Aug 2012; Markus Meier make-3.82-r3.ebuild: + x86 stable, bug #419941 + + 09 Aug 2012; Jeroen Roovers make-3.82-r3.ebuild: + Stable for HPPA (bug #419941). + + 07 Aug 2012; Agostino Sarubbo make-3.82-r3.ebuild: + Stable for amd64, wrt bug #419941 + + 06 Aug 2012; Anthony G. Basile make-3.82-r3.ebuild: + Stable arm, bug #419941 + + 06 Aug 2012; Anthony G. Basile make-3.82-r3.ebuild: + Stable ppc ppc64, bug #419941 + + 24 May 2012; Mike Frysinger make-3.81-r1.ebuild, + make-3.81-r2.ebuild, make-3.81.ebuild: + Inherit eutils for epatch. + + 26 Apr 2012; Alexis Ballier make-3.82-r3.ebuild: + keyword ~amd64-fbsd + + 30 Dec 2011; Mark Loeser make-3.82-r1.ebuild: + Stable for ppc64; bug #381199 + +*make-3.82-r4 (03 Dec 2011) + + 03 Dec 2011; Mike Frysinger +make-3.82-r4.ebuild, + +files/make-3.82-copy-on-expand.patch, +files/make-3.82-long-cmdline.patch, + +files/make-3.82-oneshell.patch, +files/make-3.82-parallel-remake.patch: + Add some more fixes from upstream, and forward port the long cmdline patch + from 3.81 #300867 by Alexander Vershilov. + + 20 Oct 2011; Brent Baude make-3.82-r1.ebuild: + Marking make-3.82-r1 ppc for bug 381199 + + 24 Sep 2011; Raúl Porcel make-3.82-r1.ebuild: + alpha/ia64/m68k/s390/sh/sparc stable wrt #381199 + + 18 Sep 2011; Markus Meier make-3.82-r1.ebuild: + arm stable, bug #381199 + +*make-3.82-r3 (17 Sep 2011) + + 17 Sep 2011; Mike Frysinger +make-3.82-r3.ebuild, + +files/make-3.82-glob-speedup.patch: + Add more complete glob optimization patch from upstream #382845 by Tomáš + Chvátal. + + 17 Sep 2011; Mike Frysinger -make-3.82-r2.ebuild, + -files/make-3.82-glob-speedup.patch: + Punt broken glob build #383311 by Lars Wendler. + +*make-3.82-r2 (17 Sep 2011) + + 17 Sep 2011; Mike Frysinger +make-3.82-r2.ebuild, + +files/make-3.82-glob-speedup.patch: + Add glob optimization patch from upstream #382845 by Tomáš Chvátal. + + 05 Sep 2011; Jeroen Roovers make-3.82-r1.ebuild: + Stable for HPPA (bug #381199). + + 04 Sep 2011; Pawel Hajdan jr make-3.82-r1.ebuild: + x86 stable wrt bug #381199 + + 31 Aug 2011; Tony Vroon make-3.82-r1.ebuild: + Marked stable on AMD64 based on arch testing by Elijah "Armageddon" El + Lazkani & Agostino "ago" Sarubbo in bug #381199 filed by Mike "SpanKY" + Frysinger. + + 09 Jul 2011; Kacper Kowalik make-3.82.ebuild: + ppc/ppc64 stable wrt #367265 + +*make-3.82-r1 (07 Jun 2011) + + 07 Jun 2011; Tony Vroon +make-3.82-r1.ebuild, + +files/make-3.82-memory-corruption.patch: + Revision bump. Patch from upstream fixes memory corruption for + Android/Cyanogenmod builds; Savannah bug report #33125. As reported by blackd + in bug #355907; patch scavenged by Mike "SpanKY" Frysinger, additional + research by Peter "loki_val" Alfredsen & Samuli Suominen. + + 05 Jun 2011; Jeroen Roovers make-3.82.ebuild: + Stable for HPPA (bug #367265). + + 05 Jun 2011; Raúl Porcel make-3.82.ebuild: + alpha/ia64/m68k/s390/sh/sparc stable wrt #367265 + + 02 Jun 2011; Markus Meier make-3.82.ebuild: + arm stable, bug #367265 + + 31 May 2011; Markus Meier make-3.82.ebuild: + x86 stable, bug #367265 + + 29 May 2011; Markos Chandras make-3.82.ebuild: + Stable on amd64 wrt bug #367265 + + 06 Feb 2011; Mart Raudsepp make-3.80-r4.ebuild, + make-3.81.ebuild: + Drop to ~mips + + 18 Oct 2010; Mike Frysinger make-3.82.ebuild: + Move into unstable. + + 18 Sep 2010; Raúl Porcel make-3.81-r2.ebuild: + sparc stable wrt #331717 + + 29 Aug 2010; Mike Frysinger make-3.82.ebuild, + +files/make-3.82-archives-many-objs.patch: + Add fix from upstream for archive targets with multiple objects #334889 by + Diego E. Pettenò. + + 18 Aug 2010; Jeroen Roovers make-3.81-r2.ebuild: + Stable for HPPA (bug #331717). + + 11 Aug 2010; Mike Frysinger make-3.81-r2.ebuild: + Stabilize for alpha/arm/ia64/s390/sh #331717. + + 11 Aug 2010; Joseph Jezak make-3.81-r2.ebuild: + Marked ppc/ppc64 stable for bug #331717. + + 10 Aug 2010; Markos Chandras make-3.81-r2.ebuild: + Stable on amd64 wrt bug #331717 + + 10 Aug 2010; Christian Faulhammer make-3.81-r2.ebuild: + stable x86, bug 331717 + + 10 Aug 2010; Mike Frysinger make-3.82.ebuild, + +files/make-3.82-MAKEFLAGS-reexec.patch: + Add fix from upstream for MAKEFLAGS expansion when re-execing #331975. + +*make-3.82 (09 Aug 2010) + + 09 Aug 2010; Mike Frysinger +make-3.82.ebuild: + Version bump #331593. + + 25 Jul 2010; Mike Frysinger make-3.81-r2.ebuild, + +files/make-3.81-tests-recursion.patch: + Add change from upstream for recursion test #329153 by Kent Fredric. + +*make-3.81-r2 (31 Mar 2010) + + 31 Mar 2010; Robin H. Johnson +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 + files/make-3.81-long-cmdline.patch: + Add some fall back code for PAGE_SIZE issues #301431 by Laurent G. + +*make-3.81-r1 (17 Jan 2010) + + 17 Jan 2010; Mike Frysinger +make-3.81-r1.ebuild, + +files/make-3.81-long-cmdline.patch: + Apply patch from upstream for long command lines #301116 by Priit Laes. + + 07 Dec 2008; Mike Frysinger make-3.80-r4.ebuild, + make-3.81.ebuild: + Switch to emake in src_install and drop USE=build cruft. + + 05 Nov 2006; Mike Frysinger + +files/make-3.81-tests-lang.patch, make-3.81.ebuild: + Grab fix from upstream for building in non-english locales #149147 by Ronny + Peine. + + 17 Oct 2006; Roy Marples make-3.81.ebuild: + Added ~sparc-fbsd keyword. + + 02 Oct 2006; Daniel Gryniewicz make-3.81.ebuild: + Marked stable on amd64 for bug #149052 + + 27 Sep 2006; Fernando J. Pereda make-3.81.ebuild: + Stable on alpha wrt bug #149052 + + 26 Sep 2006; Gustavo Zacarias make-3.81.ebuild: + Stable on sparc wrt #149052 + + 26 Sep 2006; Gustavo Zacarias make-3.81.ebuild: + Stable on hppa wrt #149052 + + 26 Sep 2006; Joshua Jackson make-3.81.ebuild: + Stable x86; bug #149052 + + 25 Sep 2006; make-3.81.ebuild: + Stable on ppc wrt bug 149052 + + 25 Sep 2006; Markus Rothe make-3.81.ebuild: + Stable on ppc64; bug #149052 + + 18 Apr 2006; Diego Pettenò make-3.81.ebuild: + Add runtime dependency on libintl when nls is enabled. + +*make-3.81 (14 Apr 2006) + + 14 Apr 2006; Mike Frysinger +make-3.81.ebuild: + Version bump. + + 30 Mar 2006; Diego Pettenò make-3.80-r4.ebuild: + Add ~x86-fbsd keywords. + + 19 Mar 2006; Fernando J. Pereda make-3.80-r4.ebuild: + Stable on alpha as per bug #126365 + + 16 Mar 2006; Torsten Veller make-3.80-r4.ebuild: + Stable on x86 (#126365) + + 16 Mar 2006; Gustavo Zacarias make-3.80-r4.ebuild: + Stable on sparc wrt #126365 + + 16 Mar 2006; Luca Barbato make-3.80-r4.ebuild: + Marked ppc + + 16 Mar 2006; Markus Rothe make-3.80-r4.ebuild: + Stable on ppc64; bug #126365 + + 16 Mar 2006; Patrick McLean make-3.80-r4.ebuild: + Stable on amd64 (bug #126365) + + 20 Feb 2006; Fernando J. Pereda make-3.80-r3.ebuild: + Stable on alpha wrt bug #123345 + + 20 Feb 2006; Gustavo Zacarias make-3.80-r3.ebuild: + Stable on sparc wrt #123345 + + 19 Feb 2006; Joshua Jackson make-3.80-r3.ebuild: + stable on x86; bug #123345 + + 19 Feb 2006; Joshua Kinard make-3.80-r3.ebuild: + Marked stable on mips. + + 19 Feb 2006; Luis Medinas make-3.80-r3.ebuild: + Stable on amd64. Bug #123345. + + 19 Feb 2006; Markus Rothe make-3.80-r3.ebuild: + Stable on ppc64; bug #123345 + + 19 Feb 2006; Joseph Jezak make-3.80-r3.ebuild: + Marked ppc stable for bug #123345. + +*make-3.80-r4 (19 Feb 2006) + + 19 Feb 2006; Mike Frysinger + +files/make-3.80-conditional-eval.patch, +make-3.80-r4.ebuild: + Add patch from upstream for conditional eval statements #123317 by Maurice + van der Pot. + +*make-3.80-r3 (29 Sep 2005) + + 29 Sep 2005; Mike Frysinger + +files/make-3.80-parallel-build-failure.patch, +make-3.80-r3.ebuild: + Add patch from upstream to fix issues with parallel builds #107613 by Icebird. + + 17 Sep 2005; Ciaran McCreesh ChangeLog: + Converted to UTF-8, fixed encoding screwups + + 16 Sep 2005; Aron Griffis make-3.80-r2.ebuild: + Mark 3.80-r2 stable on alpha + + 08 Sep 2005; Aaron Walker make-3.80-r2.ebuild: + Stable on mips. + + 03 Sep 2005; Markus Rothe make-3.80-r2.ebuild: + Stable on ppc64 + + 18 Aug 2005; Michael Hanselmann make-3.80-r2.ebuild: + Stable on ppc. + + 16 Aug 2005; Gustavo Zacarias make-3.80-r2.ebuild: + Stable on sparc + + 13 Jun 2005; Mike Frysinger make-3.80-r2.ebuild: + Make sure we dont kill make on non-GNU systems with USE=build #95942 by + Diego Pettenò. + + 03 May 2005; Diego Pettenò make-3.80-r2.ebuild: + Readded keywords to -r2 and closed the bug. + +*make-3.80-r2 (03 May 2005) + + 03 May 2005; Mike Frysinger +make-3.80-r2.ebuild: + Add support for non-GNU systems #90849. + + 06 Apr 2005; Daniel Ostrow make-3.80-r1.ebuild: + Add patch for ppc64 hardened + +*make-3.80-r1 (09 Oct 2004) + + 09 Oct 2004; Mike Frysinger +files/3.80-memory.patch, + +make-3.80-r1.ebuild: + Add patch for 'virtual memory exhausted' bug. Patch comes from + Debian/upstream. Bug by Natanael Copa #48765. + + 16 Jul 2004; Michael Sterrett make-3.80.ebuild: + gnuconfig_update in src_unpack; use emake; use bz2; use econf; use use_enable; + tidy + + 02 Jul 2004; Jeremy Huddleston + make-3.79.1-r4.ebuild, make-3.79.1-r5.ebuild, make-3.80.ebuild: + virtual/glibc -> virtual/libc + + 23 Jun 2004; Aron Griffis make-3.79.1-r4.ebuild, + make-3.79.1-r5.ebuild: + QA - fix use invocation + + 15 Jun 2004; make-3.80.ebuild: + add uclibc to the list of things gnuconfig_update is run on + + 10 Apr 2004; Joshua Kinard make-3.79.1-r5.ebuild: + Marked stable on mips, and added gnuconfig for mips64 hosts. + + 21 Mar 2004; Joshua Kinard make-3.80.ebuild: + Added gnuconfig support for mips64 hosts + + 02 Mar 2004; Brian Jackson make-3.80.ebuild: + adding initial s390 support + +*make-3.80 (14 Oct 2002) + + 17 Sep 2003; Jon Portnoy make-3.80.ebuild : + ia64 keywords. + + 06 Jul 2003; Joshua Kinard make-3.80.ebuild: + Added "mips" to KEYWORDS (works for me) + + 18 Feb 2003; Zach Welch make-3.80.ebuild : + Added arm to keywords. + + 09 Feb 2003; Guy Martin make-3.80.ebuild : + Added hppa to keywords. + + 06 Dec 2002; Rodney Rees : + changed sparc ~sparc keywords + + 14 Oct 2002; Martin Schlemmer : + + Update version. + +*make-3.79.1-r5 (29 Sep 2002) + + 29 Sep 2002; Martin Schlemmer : + + Install gmake as symlink to make for compat reasons. + Closes bug #8487. + +*make-3.79.1-r4 (07 Aug 2002) + + 18 Jan 2003; Jan Seidel : + Added mips to keywords + + 07 Aug 2002; Martin Schlemmer : + + Do not install make sgid. Resolves bug #4056. + +*make-3.79.1-r3 (1 Feb 2002) + + 1 Feb 2002; G.Bevin ChangeLog : + + Added initial ChangeLog which should be updated whenever the package is + updated in any way. This changelog is targetted to users. This means that the + comments should well explained and written in clean English. The details about + writing correct changelogs are explained in the skel.ChangeLog file which you + can find in the root directory of the portage repository. diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/make/Manifest index 398a73cd7c..9f90b6ff45 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/Manifest @@ -1 +1,41 @@ -DIST make-3.82.tar.bz2 1242186 RMD160 e3d1f7019549553b9fc7a88884c9b85d25a60d21 SHA1 b8a8a99e4cb636a213aad3816dda827a92b9bbed SHA256 e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX 3.80-memory.patch 2248 SHA256 0fa6d8b039fd56313626a3865cde7ef09622525a751ec55bf3741a6fc172091f SHA512 dc2654f236d72fcde4cc7c0249cec31cf46b3d80d4dc6c5659f65cab22c010a1edc202ab6b005237c78930939fe676461e04b426b348beaa912835ee04bc67cc WHIRLPOOL a520b7257d2ee3b6c297cf06b70a01ad26d7842dc2dabe01b444c4f5cc9b95cd987db4b8ecb46cfe1e848a8cc5b60c831524d38d8917c1918fd9be05eca9993c +AUX make-3.80-conditional-eval.patch 4144 SHA256 68f182f5435296b60acc710006bddf745bee6c37e68ae2942c778add93a40155 SHA512 6cc783cdfe315580f0143605a3f41ef48e06a510858178c5647145d05bd8a6b420080cfbbd0ffe640ad41385d197f6e7aba8f37dda2c3589c9316898658a4593 WHIRLPOOL 67405a9079a27ac9b90fdcfd1ad0a29966c2f5691f1ddaa8dd658e235c3900bb105ac61da48880dbb4d7749ac88d5f150b657475bb8a00d358a71e186df0fed5 +AUX make-3.80-parallel-build-failure.patch 2210 SHA256 71f80dee56a04f30f2fe8bb9012d32ed830d2e0e9f68c183819c5ccf025c9b62 SHA512 09d85abae6df739df02ca46fe7652a256cf9b6765c6599688795d0aae827608d9606e7870d634b8eb5662665d888c7316ca6c83c5be11fa9578c13334eb83330 WHIRLPOOL bd068564283aa74bbe7782be180124087d77fc0bf63922d62ef4959141b37fd32a4b1762015a9c2fdf9a670cb404b921d9eee959f66709ce359c95da6b8de9eb +AUX make-3.81-jobserver.patch 543 SHA256 0c38417b19d1950f0665b17a2c4ddb503ebd3741ab3e5099fa54e93eaa989d60 SHA512 0e9aa06a9bc4db784eaebf8b0689e3cc049a261a9948bfc16b2aee195b177a5e2f5b47f004c653807298513b000ed7ea2ed586fe758bfa2a0c9c08c97a71131c WHIRLPOOL 162924b759648c91e8c1bac33dc20d6903d4a6c0dab3f81069a13ad9049ef475b327cadac7718df56b1f41c2d85acb090de4126d358d3cadba2f24ffe36d9f86 +AUX make-3.81-long-cmdline.patch 2823 SHA256 0609897c53f29fca55b0f064a45af881cb1c98297c5c7f43e0bde154622f3c26 SHA512 40241b167bb724d3f50658338346d5b6674076fcd30bcb50c3e8e4e032d0745eb0d251856496d5ecdc47cb14aabb59ab3a47a4f48cabbf670c118e887897728d WHIRLPOOL 01d6fb72de3652f762ed5a632153cd22711a626c4a86d9f391b4ffbfd9f355d0b755a775f2d67e7972d5998eaa3b2033e04bfdb6b98f4c0066aa3cdd161cbd82 +AUX make-3.81-tests-lang.patch 1788 SHA256 0d2f6b061ed2b09babbb851d1bcebcd20bc2331c799d469bfefa2a985774e486 SHA512 1717c35f8b87aa694be75f2ca42162d06a66488e9ba2c004f0daebf4cd3cf06f65aa980adf745179408d55d45b6bbb889596d5f39b28c928a0ddfd273405ec8b WHIRLPOOL d418ae2f10f3f03f5b4e2601229bd30a8236cb18bded1edfb67f5c8791cfd3a1cf4bd3f535b6ca572844f72ce10f2a92e67e153f9de311196a75e96d57a95b2d +AUX make-3.81-tests-recursion.patch 514 SHA256 727a42dd884d296d421342f374b95ac05eeaef67c5f5efe755f1242944aab74b SHA512 8119045661bb08d468a0975f6e0a9606768bb6122c9c5cdb9e8b74926cd37e0e1a5a60486aab306106d1c1de0b3a83b072a6999b3ba33d6a0befc333f658da00 WHIRLPOOL 77eef52ca8b00539c8d7cbd1cfcf9e930d48707c706897a082bc40f2c1cab82d14b3ec1d7eb5be5b248cee4999cb8d9234429fca6e0af71f914c214a8390582b +AUX make-3.82-MAKEFLAGS-reexec.patch 456 SHA256 0180a94ab07bb9c1348ab30301afcbbe382a281c4c6f143de16e3bea3d96e00c SHA512 675c528ea92c9df487c0a9d9058a304f970543f71991c70cc1399f3b6582316dac8b387aa1a744b0d6dcbe215775efea4e936b09553bccbfced3dcbc28af5532 WHIRLPOOL 5da896f02f24c5813a25cfccc4029b4f0a674c2f10d86057bdc59bf4f8be24bfba2886a91c63feadf5805ab26c85098c6c3c5be7c4b1ceddc1edee6328874a88 +AUX make-3.82-archives-many-objs.patch 2110 SHA256 268db7c9e98f540ac9d5466bba17946f400463c1fd934d419e37fafaea7f0dd7 SHA512 c3669a4a2104621e3dab921793635c1443ec389ef160d1171d3181d58a1568d88ff35044b70298edef504f63e449ddb7fb27f9528cf588ca643dcdc3e40ebab7 WHIRLPOOL fc4e7b40bf67638c2e5ec476dd49a7ffd2dcd5aba465367ffbd734bec6b1c0a5b792cc704ba6414802318601ee558236d17b49bfdd7405610b0bb5f3bc0f9c06 +AUX make-3.82-construct-command-line.patch 2307 SHA256 5ba054cd764f493acc5f3f8acda9028e6fd2324508ca4dae7fbce04e491da0a5 SHA512 7c72bd7b9da986a8a37b047b7944a07b729fb16cd3413bce0e17008f2bbc4afabc48835580c4302d1381552873d1f07c93fbc4dfb6862eab0e46c62b0d35f557 WHIRLPOOL 59dae0e195a2fb6cdfb103f41870d31bae4d506df96b6e4abfbe96e39b35a6b6be9a25a7ce6663a67c3a842a09e8023e4c20754601dae1921514df77b6e3289a +AUX make-3.82-copy-on-expand.patch 1812 SHA256 866a3942f9c747aecc5dd6c313f1fbd2f8f0b457a28197756c5713aefa45f543 SHA512 e7e31edfe3f11a91a4e2d0377a15328d6b54ab7b614c9d0c8ab6b18b5a8a5e2fa852ac7469bee685fcbdaa46d22f81fd585d0683a762afaa4160d7a7d5a558c8 WHIRLPOOL 4b8f123509131c495f15aacab0f906c864204c06554d07c5ac91d225ac6e4998d3fa1014a9780d8e3ef8a2c360c19a55bd84cd726f0ae0f150efdf92d3c60f11 +AUX make-3.82-darwin-library_search-dylib.patch 439 SHA256 726ddb522e6d46ac1fe29c0d76329c8264f53fc2a19baa94771e9299d9bfd54e SHA512 aaabf2e7faaa6f116c0124d30e8bc5c049fa471defc39c454e03e3f484265f30fc0388ea13154559925935d803315b5594780b41bbf1d1f7d1599a60f85cd8ac WHIRLPOOL 2a344dabd157fcb90ba97a8e774fb151cb32067b5cb8f8dda662be3ec9c425081e1a76d217448167ecc6b98e1699b2b6cd6580ccd0b8a465c0f91c254a76d6ee +AUX make-3.82-glob-speedup.patch 2833 SHA256 525896b152bb314cbf3c465575394584305ded895429bf4ade919d69dedfec06 SHA512 de6bacc4e389c2308a92b77b6f21f752ed078af6f5320481f84e8344532825a5b2225ddb9c8eba40badf9d377d1e5546906ab265e5c08a815cce01b0832dfe1c WHIRLPOOL ac2101cc81778c6a425566224594a89a958ce1d7dbd9bfb1e71bdea3ed794aa4c7de0b970f1603240f0f1072ef61c18a5fd839badd904dd2f551579dd45d7399 +AUX make-3.82-intermediate-parallel.patch 1863 SHA256 05ba85e34ed727ea5bbeebcbeab467da1ec97edf7a9543b246896daa02b72a55 SHA512 6cebec44deda36e1a25fd5b0641ecfb90dc708d7d5dca2dd6108cc2bf0be142f26e96a5979a7b456c6f29517853e1abb7a755b078fef3c0f452437c7f0c38379 WHIRLPOOL 4ad303da4f73241ccb6a58f116b19d8f64fbe22bf2a6e0885c5df15ae95d3197fecda2a71a7b8f3be7a2de4362fd9de84359b7ee317154478b54b49389a994de +AUX make-3.82-long-command-line.patch 1598 SHA256 da196f8050c717d42110e9328b3413a61719a7064e5b76bb1a539f492e6a1613 SHA512 b86336d6e337a8d7524a90ec75944772aab48cba45ab003adc5b71c3a4604350ecb16c398a003cd3ac7ff900d841b915d771626e9a8485778ce72e43510f107c WHIRLPOOL 8d9e9454cddef12e7def055add4a695f1c62ad13e57afec4219e3e88d290d12368dd27fb491f47fe8400ba8528755fc2faf90fae64e47daa79618358f8b17814 +AUX make-3.82-memory-corruption.patch 899 SHA256 8bb84e638f40514045f0c57b0ee9da24024679f624614e4d954ce7e8f6414d3b SHA512 a65428bf6a1ff3bbe811cbf633577f15399bdaeab11fab0e66a104987df4dffc7779753aaaaad0534e591ca6df2fbebfca6522b35487e6bf9166b0681c271ae8 WHIRLPOOL 0200c90954a948108b21e5cec6c95f02479bc0d189cc9cf76de6b0f4c3647225fde83e775b07f23cc4d0e040c02c3ca5972c2f75ac1da8f2ec4896ff21a6ea2f +AUX make-3.82-oneshell.patch 931 SHA256 017bd61d9ed44a9cda3f7dc2c49d65be33b9b3a225580ad36e9caf5c8481f184 SHA512 85784dfcfeee2b7d7d3d659edc39a268165ab3f9dbd3d716ffcc7ba52cb44c3011cf5aa3e57cdab12f2f8aeec4ff00ffe82959aef242951f4dc1a7c6d4b55d89 WHIRLPOOL 287b8cefc2abfbe4a7825499f6c15db192be1b7941c25a1d5d260fc795a38bbb97923a8da5fe0035697c3dae36bd26b2633d316f6c9c9882be23aee51ece2d62 +AUX make-3.82-parallel-remake.patch 1422 SHA256 e2b63a63a44fb692798d237f888ad35a0899144fc5c6700270dee8ee455ac231 SHA512 640489810aa387524d5b7b0c38b22d13c423e1ca04c2a8915d1736904aa6e158f999eda5d6b0f17c21a85f97b490e73c85fd2d205d494c98099e379842a1fccc WHIRLPOOL cfc8ba57e22524ba675aa916eafcdc5b4bd2121f7d1dfd6cb73a2fadc365975af8360e61b70260632fa13292537ed7ea169861745deb3cd7956a6ff4ff364738 +DIST make-3.80.tar.bz2 920645 SHA256 a99b39e7b04c333724f48c38fede709481cfb69fafe7e32ae4285b7fadf92f1b +DIST make-3.81.tar.bz2 1151445 SHA256 f3e69023771e23908f5d5592954d8271d3d6af09693cecfd29cee6fde8550dc8 SHA512 f38b8219a966b4756149a13435f5b9dc760814aa62c6add8e1760e602f65a83cd0a45ed457a5dbdd2fab91043af4de2c60e62154f95c6b625af3703c824eb653 WHIRLPOOL 39d33b8b9136a3a8cf732fe8f437729ab5d487dc3e6dca0cad6dcdea256eec799d19c6c8d2591c3b526e7bd4fdd901ca7eb1d9e77e525454a3e52e17fd181ce7 +DIST make-3.82.tar.bz2 1242186 SHA256 e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966 SHA512 3260be0d1a9a7c5eb0dbb87179a9a9521fdfc7809ca51f13ee5a37ba5e63d21ad50a4249ec7d3929a9d0ce8c8f6cf302558743964f0f7ff742efe283b91df9de WHIRLPOOL 0b6b5f95f33e0e5584cddad234afb2350bbf62f2a9c280703345100eba7867d80412cbe1b22f429eb32db43dd37e665e0f136d0262ee3f030cf384f77e99d1cb +EBUILD make-3.80-r4.ebuild 1139 SHA256 9255d743c5381166aeac922b2b4b4c50fb8234c0f9a1c61b96f79ad6972148f6 SHA512 78cf993af5ecf8f89270ff29bc8de0cf9a082d299d26246ae122ef832eeee13e4da540d3b9739e722d84aa05bdf0096b0468fb6f5674235b752e804b1ce9e2b3 WHIRLPOOL 6acf4998b8e89c9ddbac636c1c23ab64a6437d8089f2a7aa80a74e2004c60c5ef55db46c2c1ba8a89e1f290f8bfcb2533681679fcb94079419638a6cc158373d +EBUILD make-3.81-r1.ebuild 1210 SHA256 773900dc3f41b0dc65a8b3512654649423536cd57d608ea41bf6cadc13af5d83 SHA512 361b971d057226b89e945a74141829c60955f762bd45ed0f44517f12b11292443061edac31376fa8e10b2ca092d9b80b0fec2293733407ddb39dbb92a735b058 WHIRLPOOL 3092d616212a2e066e8f848bf0edc21ce7ccaa8c4186b709b5b4a0f401fc561fd916e50c3700d83cee63334ab1ef22c02aa27dc8cb857a050e4e92f8cf21e650 +EBUILD make-3.81-r2.ebuild 1307 SHA256 e9869620c7d244c93b029362a4e370320ac8c17a4f509d9b8c3e8e8abcb2c234 SHA512 7b439eb63e17fe4fff7bb854c52c6976c41457eb0932da0c83479f2fe1fc50111d58dd0e7f6a66dd1aeb0b76e2aac7b3643b2d6883cf378f0916635dae97de56 WHIRLPOOL 7ad244e63180910b8a3172e03143aba27b56d573e16ddb14e0baf0d86f48ff9135f7b2b6e93b36e8f27c33dc2e5efbd3684cf9a55488c273c12ada8e66cd58cf +EBUILD make-3.81.ebuild 1142 SHA256 a64392d4eab939ce0b5da99775ab1e216d9c32827f0e595d2f10a72c6a2e6c6f SHA512 718f2485de85c7650297e812606b1e9c6ded70b3b5cb0790ff6322bcdd854315df60e53f758d7d6d37d5674e575839abaf2017125eeb6e9b307da88bc509624d WHIRLPOOL 680cd8719e7ee66823b0e8a5ed4c98023219210ce905b40bb975774ea3fcabf75f943c2c3409e1b96031263c23053ffa0c5013622db82e33378c9064a0f4c15e +EBUILD make-3.82-r1.ebuild 1241 SHA256 449e8f16fab46f04f9d21b52e4712af3922ceaa3bc2b1e8630932d7bb36c9ae7 SHA512 028e96393149ea59b1c84afbb2daaeae57232c2d603f959b67bde06d128d4f84e611dfb296256d83aa8d562556edbf402bd454aed20698eac90e4010743d1899 WHIRLPOOL 53c4781723d629206b58e12cde9ce7996893a2035f473fd8751e36b1794b5961c161e544c087feca860c8c038ab13c4a248425fc646c7e29fd75f7d1d97b4537 +EBUILD make-3.82-r3.ebuild 1307 SHA256 86260b468454eb17687dcaac59d288dd1ab192a354b87ba4e9db617342b676f2 SHA512 3000360b794c7f6db2e249a189e386b74410f6e124f2cefa6947db839fb9135ea13944f8c6e34a3644bd776ac45f1df1b4c9883355dca0ebc922dedf9d601fcf WHIRLPOOL 2b9f5e865b984a3a164b95d028e6127cc2e439ba7e8e16019aa954bb6bab8390170b8188ebec336175c96fd671d80a2d5f65490ed5d11b3af88be5a6d6c40b93 +EBUILD make-3.82-r4.ebuild 1875 SHA256 7cee00db1523fa86d61bba1244ec75ee3582c58fc21ddc4bfddb75bd4a73edc3 SHA512 f5817dd770605919bbf04de11efb29f7dfb03647134dd1c958fe93913dda00a3e411115642222cc98a141c99b7901140ccdcfa81b0c953090834b45aa385ea40 WHIRLPOOL 549ad92c4f7f7aa1010b3e0dc3ff2755ab3080e2fd7e15185054905ac3dc8ba33a82974cfa98f4cb840ecc38844988f499aad4dffc81680e9511cfc6c271001e +EBUILD make-3.82.ebuild 1183 SHA256 1f2ca73bb4d269ad882400528a2eeb2e22fbcee64fb8a589b074009b5df6ea52 SHA512 cc6cc43313c4381fe770ef6d6838d2e66da5ffab950f607f19ffc2f62958f5f15b411292be621ce3ce90f323866807bf03996209f2c694db54921177247d968c WHIRLPOOL 431e29680e0fcbad27939d2a5f37b793b0d605b34289776877ffe4673ab99712101cb5637b702e99b76f63e67625b5914962cd5ab3fe4a1f165dc01412949c96 +MISC ChangeLog 14902 SHA256 d39a064a5e1063a97358ab8d88936484b69611625254d09c357ad3fb96e9c446 SHA512 15a5f55334e600e67f5fba3e535e3fcffebfc68c10755f1accecf3121fb49b824bbac648c742734c21ba6ce2978c47f85b424f5aedb3ac34bf0c33cf3af7cc4d WHIRLPOOL 2705a90390d8be53f8f21005ac36d2ee26c86373fdf219af6d83ffe8885f5f174b52cc1f5314e285eed48078102d63d21e939ff3934f1f5c455f0f3ca5f12245 +MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iEYEAREIAAYFAlEi6tsACgkQ/ejvha5XGaNb4wCgxtgXUPuLT8AVRLYTqm41voZX +NFYAn1Zvk6pmSV5Ao0awdfms9xFXDZw1 +=Gc4r +-----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/3.80-memory.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/3.80-memory.patch new file mode 100644 index 0000000000..663acf52d7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/3.80-memory.patch @@ -0,0 +1,77 @@ +Index: variable.h +=================================================================== +RCS file: /cvsroot/make/make/variable.h,v +retrieving revision 1.24 +diff -u -B -b -r1.24 variable.h +--- variable.h 8 Aug 2002 00:11:19 -0000 1.24 ++++ variable.h 25 Oct 2002 21:37:32 -0000 +@@ -107,6 +107,8 @@ + extern char *expand_argument PARAMS ((char *str, char *end)); + extern char *variable_expand_string PARAMS ((char *line, char *string, + long length)); ++extern void install_variable_buffer PARAMS ((char **bufp, unsigned int *lenp)); ++extern void restore_variable_buffer PARAMS ((char *buf, unsigned int len)); + + /* function.c */ + extern int handle_function PARAMS ((char **op, char **stringp)); +Index: expand.c +=================================================================== +RCS file: /cvsroot/make/make/expand.c,v +retrieving revision 1.33 +diff -u -B -b -r1.33 expand.c +--- expand.c 14 Oct 2002 21:54:04 -0000 1.33 ++++ expand.c 25 Oct 2002 21:37:32 -0000 +@@ -545,3 +545,28 @@ + + return value; + } ++ ++/* Install a new variable_buffer context, returning the current one for ++ safe-keeping. */ ++ ++void ++install_variable_buffer (char **bufp, unsigned int *lenp) ++{ ++ *bufp = variable_buffer; ++ *lenp = variable_buffer_length; ++ ++ variable_buffer = 0; ++ initialize_variable_output (); ++} ++ ++/* Restore a previously-saved variable_buffer setting (free the current one). ++ */ ++ ++void ++restore_variable_buffer (char *buf, unsigned int len) ++{ ++ free (variable_buffer); ++ ++ variable_buffer = buf; ++ variable_buffer_length = len; ++} +Index: function.c +=================================================================== +RCS file: /cvsroot/make/make/function.c,v +retrieving revision 1.71 +diff -u -B -b -r1.71 function.c +--- function.c 14 Oct 2002 21:54:04 -0000 1.71 ++++ function.c 25 Oct 2002 21:37:32 -0000 +@@ -1196,7 +1196,17 @@ + static char * + func_eval (char *o, char **argv, const char *funcname) + { ++ char *buf; ++ unsigned int len; ++ ++ /* Eval the buffer. Pop the current variable buffer setting so that the ++ eval'd code can use its own without conflicting. */ ++ ++ install_variable_buffer (&buf, &len); ++ + eval_buffer (argv[0]); ++ ++ restore_variable_buffer (buf, len); + + return o; + } \ No newline at end of file diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.80-conditional-eval.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.80-conditional-eval.patch new file mode 100644 index 0000000000..f4c1581f31 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.80-conditional-eval.patch @@ -0,0 +1,157 @@ +Fix from upstream + +https://savannah.gnu.org/bugs/index.php?func=detailitem&item_id=1516 +http://bugs.gentoo.org/123317 + +Index: read.c +=================================================================== +RCS file: /cvsroot/make/make/read.c,v +retrieving revision 1.124 +retrieving revision 1.125 +diff -u -p -r1.124 -r1.125 +--- read.c 14 Oct 2002 21:54:04 -0000 1.124 ++++ read.c 25 Oct 2002 22:01:47 -0000 1.125 +@@ -272,6 +272,34 @@ read_all_makefiles (char **makefiles) + return read_makefiles; + } + ++/* Install a new conditional and return the previous one. */ ++ ++static struct conditionals * ++install_conditionals (struct conditionals *new) ++{ ++ struct conditionals *save = conditionals; ++ ++ bzero ((char *) new, sizeof (*new)); ++ conditionals = new; ++ ++ return save; ++} ++ ++/* Free the current conditionals and reinstate a saved one. */ ++ ++static void ++restore_conditionals (struct conditionals *saved) ++{ ++ /* Free any space allocated by conditional_line. */ ++ if (conditionals->ignoring) ++ free (conditionals->ignoring); ++ if (conditionals->seen_else) ++ free (conditionals->seen_else); ++ ++ /* Restore state. */ ++ conditionals = saved; ++} ++ + static int + eval_makefile (char *filename, int flags) + { +@@ -388,6 +416,8 @@ int + eval_buffer (char *buffer) + { + struct ebuffer ebuf; ++ struct conditionals *saved; ++ struct conditionals new; + const struct floc *curfile; + int r; + +@@ -402,8 +432,12 @@ eval_buffer (char *buffer) + curfile = reading_file; + reading_file = &ebuf.floc; + ++ saved = install_conditionals (&new); ++ + r = eval (&ebuf, 1); + ++ restore_conditionals (saved); ++ + reading_file = curfile; + + return r; +@@ -412,13 +446,8 @@ eval_buffer (char *buffer) + + /* Read file FILENAME as a makefile and add its contents to the data base. + +- SET_DEFAULT is true if we are allowed to set the default goal. ++ SET_DEFAULT is true if we are allowed to set the default goal. */ + +- FILENAME is added to the `read_makefiles' chain. +- +- Returns 0 if a file was not found or not read. +- Returns 1 if FILENAME was found and read. +- Returns 2 if FILENAME was read, and we kept a reference (don't free it). */ + + static int + eval (struct ebuffer *ebuf, int set_default) +@@ -782,9 +811,7 @@ eval (struct ebuffer *ebuf, int set_defa + + /* Save the state of conditionals and start + the included makefile with a clean slate. */ +- save = conditionals; +- bzero ((char *) &new_conditionals, sizeof new_conditionals); +- conditionals = &new_conditionals; ++ save = install_conditionals (&new_conditionals); + + /* Record the rules that are waiting so they will determine + the default goal before those in the included makefile. */ +@@ -810,14 +837,8 @@ eval (struct ebuffer *ebuf, int set_defa + } + } + +- /* Free any space allocated by conditional_line. */ +- if (conditionals->ignoring) +- free (conditionals->ignoring); +- if (conditionals->seen_else) +- free (conditionals->seen_else); +- +- /* Restore state. */ +- conditionals = save; ++ /* Restore conditional state. */ ++ restore_conditionals (save); + + goto rule_complete; + } +Index: tests/scripts/functions/eval +=================================================================== +RCS file: /cvsroot/make/make/tests/scripts/functions/eval,v +retrieving revision 1.1 +retrieving revision 1.2 +diff -u -p -r1.1 -r1.2 +--- tests/scripts/functions/eval 8 Jul 2002 02:26:48 -0000 1.1 ++++ tests/scripts/functions/eval 25 Oct 2002 22:01:47 -0000 1.2 +@@ -57,4 +57,35 @@ $answer = "A = A B = B\n"; + + &compare_output($answer,&get_logfile(1)); + ++# Test to make sure eval'ing inside conditionals works properly ++ ++$makefile3 = &get_tmpfile; ++ ++open(MAKEFILE,"> $makefile3"); ++ ++print MAKEFILE <<'EOF'; ++FOO = foo ++ ++all:: ; @echo it ++ ++define Y ++ all:: ; @echo worked ++endef ++ ++ifdef BAR ++$(eval $(Y)) ++endif ++ ++EOF ++ ++close(MAKEFILE); ++ ++&run_make_with_options($makefile3, "", &get_logfile); ++$answer = "it\n"; ++&compare_output($answer,&get_logfile(1)); ++ ++&run_make_with_options($makefile3, "BAR=1", &get_logfile); ++$answer = "it\nworked\n"; ++&compare_output($answer,&get_logfile(1)); ++ + 1; diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.80-parallel-build-failure.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.80-parallel-build-failure.patch new file mode 100644 index 0000000000..717e0f3556 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.80-parallel-build-failure.patch @@ -0,0 +1,59 @@ +http://lists.gnu.org/archive/html/bug-make/2005-07/msg00050.html +http://lists.gnu.org/archive/html/bug-make/2005-08/msg00019.html +http://bugs.gentoo.org/107613 + +2005-08-07 Paul D. Smith + + Fix a bug reported by Michael Matz : patch included. + If make is running in parallel without -k and two jobs die in a + row, but not too close to each other, then make will quit without + waiting for the rest of the jobs to die. + + * main.c (die): Don't reset err before calling reap_children() the + second time: we still want it to be in the error condition. + * job.c (reap_children): Use a static variable, rather than err, + to control whether or not the error message should be printed. + +Index: job.c +=================================================================== +RCS file: /cvsroot/make/make/job.c,v +retrieving revision 1.166 +retrieving revision 1.167 +diff -u -p -r1.166 -r1.167 +--- job.c 26 Jun 2005 03:31:30 -0000 1.166 ++++ job.c 8 Aug 2005 05:08:00 -0000 1.167 +@@ -475,9 +479,14 @@ reap_children (int block, int err) + + if (err && block) + { +- /* We might block for a while, so let the user know why. */ ++ static int printed = 0; ++ ++ /* We might block for a while, so let the user know why. ++ Only print this message once no matter how many jobs are left. */ + fflush (stdout); +- error (NILF, _("*** Waiting for unfinished jobs....")); ++ if (!printed) ++ error (NILF, _("*** Waiting for unfinished jobs....")); ++ printed = 1; + } + + /* We have one less dead child to reap. As noted in +Index: main.c +=================================================================== +RCS file: /cvsroot/make/make/main.c,v +retrieving revision 1.210 +retrieving revision 1.211 +diff -u -p -r1.210 -r1.211 +--- main.c 12 Jul 2005 04:35:13 -0000 1.210 ++++ main.c 8 Aug 2005 05:08:00 -0000 1.211 +@@ -2990,7 +2996,8 @@ die (int status) + print_version (); + + /* Wait for children to die. */ +- for (err = (status != 0); job_slots_used > 0; err = 0) ++ err = (status != 0); ++ while (job_slots_used > 0) + reap_children (1, err); + + /* Let the remote job module clean up its state. */ diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.81-jobserver.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.81-jobserver.patch new file mode 100644 index 0000000000..cd787ca769 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.81-jobserver.patch @@ -0,0 +1,19 @@ +related to bug #193258, but this is the final patch that Fedora went with + +--- 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/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.81-long-cmdline.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.81-long-cmdline.patch new file mode 100644 index 0000000000..9ceb5e8195 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.81-long-cmdline.patch @@ -0,0 +1,100 @@ +http://bugs.gentoo.org/301116 + +tweaked a little to avoid regenerating autotools + +2009-07-29 Ralf Wildenhues gmx.de> + + * configure.in: Check for sys/user.h and linux/binfmts.h + headers. + * job.c: Include them if available. + (construct_command_argv_internal): When constructing the command + line with 'sh -c', use multiple arguments together with eval + expansion to evade the Linux per-argument length limit + MAX_ARG_STRLEN if it is defined. + Problem reported against Automake by Xan Lopez gnome.org>. + +--- job.c.orig 2010-01-15 18:36:53.000000000 +0200 ++++ job.c 2010-01-15 18:41:09.000000000 +0200 +@@ -29,6 +29,15 @@ + + #include + ++#if defined(__linux__) /* defined (HAVE_LINUX_BINFMTS_H) && defined (HAVE_SYS_USER_H) */ ++#include ++#include ++#ifndef PAGE_SIZE ++#define PAGE_SIZE sysconf(_SC_PAGE_SIZE) ++#endif ++#include ++#endif ++ + /* Default shell to use. */ + #ifdef WINDOWS32 + #include +@@ -2697,9 +2702,19 @@ + #endif + unsigned int line_len = strlen (line); + ++#ifdef MAX_ARG_STRLEN ++ static char eval_line[] = "eval\\ \\\"set\\ x\\;\\ shift\\;\\ "; ++#define ARG_NUMBER_DIGITS 5 ++#define EVAL_LEN (sizeof(eval_line)-1 + shell_len + 4 \ ++ + (7 + ARG_NUMBER_DIGITS) * 2 * line_len / (MAX_ARG_STRLEN - 2)) ++#else ++#define EVAL_LEN 0 ++#endif + char *new_line = (char *) alloca (shell_len + (sizeof (minus_c) - 1) +- + (line_len * 2) + 1); ++ + (line_len*2) + 1 + EVAL_LEN); ++ + char *command_ptr = NULL; /* used for batch_mode_shell mode */ ++ char *args_ptr; + + # ifdef __EMX__ /* is this necessary? */ + if (!unixy_shell) +@@ -2712,6 +2727,30 @@ + bcopy (minus_c, ap, sizeof (minus_c) - 1); + ap += sizeof (minus_c) - 1; + command_ptr = ap; ++ ++#if !defined (WINDOWS32) && defined (MAX_ARG_STRLEN) ++ if (unixy_shell && line_len > MAX_ARG_STRLEN) ++ { ++ unsigned j; ++ memcpy (ap, eval_line, sizeof (eval_line) - 1); ++ ap += sizeof (eval_line) - 1; ++ for (j = 1; j <= 2 * line_len / (MAX_ARG_STRLEN - 2); j++) ++ ap += sprintf (ap, "\\$\\{%u\\}", j); ++ *ap++ = '\\'; ++ *ap++ = '"'; ++ *ap++ = ' '; ++ /* Copy only the first word of SHELL to $0. */ ++ for (p = shell; *p != '\0'; ++p) ++ { ++ if (isspace ((unsigned char)*p)) ++ break; ++ *ap++ = *p; ++ } ++ *ap++ = ' '; ++ } ++#endif ++ args_ptr = ap; ++ + for (p = line; *p != '\0'; ++p) + { + if (restp != NULL && *p == '\n') +@@ -2760,6 +2799,14 @@ + } + #endif + *ap++ = *p; ++ ++#if !defined (WINDOWS32) && defined (MAX_ARG_STRLEN) ++ if (unixy_shell && line_len > MAX_ARG_STRLEN && (ap - args_ptr > MAX_ARG_STRLEN - 2)) ++ { ++ *ap++ = ' '; ++ args_ptr = ap; ++ } ++#endif + } + if (ap == new_line + shell_len + sizeof (minus_c) - 1) + /* Line was empty. */ diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.81-tests-lang.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.81-tests-lang.patch new file mode 100644 index 0000000000..f4e514712a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.81-tests-lang.patch @@ -0,0 +1,55 @@ +Fix from upstream for running tests when LC_ALL is set to non-C + +http://bugs.gentoo.org/149147 + +Index: make/tests/run_make_tests.pl +=================================================================== +RCS file: /cvsroot/make/make/tests/run_make_tests.pl,v +retrieving revision 1.22 +retrieving revision 1.23 +diff -u -p -r1.22 -r1.23 +--- make/tests/run_make_tests.pl 8 Mar 2006 20:15:09 -0000 1.22 ++++ make/tests/run_make_tests.pl 1 Oct 2006 05:38:38 -0000 1.23 +@@ -228,11 +228,6 @@ sub set_more_defaults + local($string); + local($index); + +- # Make sure we're in the C locale for those systems that support it, +- # so sorting, etc. is predictable. +- # +- $ENV{LANG} = 'C'; +- + # find the type of the port. We do this up front to have a single + # point of change if it needs to be tweaked. + # +Index: make/tests/test_driver.pl +=================================================================== +RCS file: /cvsroot/make/make/tests/test_driver.pl,v +retrieving revision 1.19 +retrieving revision 1.20 +diff -u -p -r1.19 -r1.20 +--- make/tests/test_driver.pl 10 Mar 2006 02:20:45 -0000 1.19 ++++ make/tests/test_driver.pl 1 Oct 2006 05:38:38 -0000 1.20 +@@ -78,9 +78,9 @@ sub resetENV + sub toplevel + { + # Pull in benign variables from the user's environment +- # ++ + foreach (# UNIX-specific things +- 'TZ', 'LANG', 'TMPDIR', 'HOME', 'USER', 'LOGNAME', 'PATH', ++ 'TZ', 'TMPDIR', 'HOME', 'USER', 'LOGNAME', 'PATH', + # Purify things + 'PURIFYOPTIONS', + # Windows NT-specific stuff +@@ -92,6 +92,10 @@ sub toplevel + $makeENV{$_} = $ENV{$_} if $ENV{$_}; + } + ++ # Make sure our compares are not foiled by locale differences ++ ++ $makeENV{LC_ALL} = 'C'; ++ + # Replace the environment with the new one + # + %origENV = %ENV; diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.81-tests-recursion.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.81-tests-recursion.patch new file mode 100644 index 0000000000..490e2a912c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.81-tests-recursion.patch @@ -0,0 +1,14 @@ +http://bugs.gentoo.org/329153 +https://savannah.gnu.org/bugs/index.php?29968 + +--- tests/scripts/features/recursion 2005/02/10 00:10:58 1.2 ++++ tests/scripts/features/recursion 2010/07/01 07:16:00 1.3 +@@ -16,7 +16,7 @@ + @echo MAKELEVEL = $(MAKELEVEL) + @echo THE END + ', +- ('CFLAGS=-O -w' . ($parallel_jobs ? '-j 2' : '')), ++ ('CFLAGS=-O -w' . ($parallel_jobs ? ' -j 2' : '')), + ($vos + ? "#MAKE#: Entering directory `#PWD#' + make 'CFLAGS=-O' -f #MAKEFILE# foo diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-construct-command-line.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-construct-command-line.patch new file mode 100644 index 0000000000..c504c45291 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-construct-command-line.patch @@ -0,0 +1,71 @@ +https://savannah.gnu.org/bugs/?23922 + +From 6f3684710a0f832533191f8657a57bc2fbba90ba Mon Sep 17 00:00:00 2001 +From: eliz +Date: Sat, 7 May 2011 08:29:13 +0000 +Subject: [PATCH] job.c (construct_command_argv_internal): Don't assume + shellflags is always non-NULL. Escape-protect characters + special to the shell when copying the value of SHELL into + new_line. Fixes Savannah bug #23922. + +--- + ChangeLog | 7 +++++++ + job.c | 23 ++++++++++++++++------- + 2 files changed, 23 insertions(+), 7 deletions(-) + +diff --git a/job.c b/job.c +index 67b402d..c2ce84d 100644 +--- a/job.c ++++ b/job.c +@@ -2844,12 +2844,12 @@ construct_command_argv_internal (char *line, char **restp, char *shell, + + unsigned int shell_len = strlen (shell); + unsigned int line_len = strlen (line); +- unsigned int sflags_len = strlen (shellflags); ++ unsigned int sflags_len = shellflags ? strlen (shellflags) : 0; + char *command_ptr = NULL; /* used for batch_mode_shell mode */ + char *new_line; + + # ifdef __EMX__ /* is this necessary? */ +- if (!unixy_shell) ++ if (!unixy_shell && shellflags) + shellflags[0] = '/'; /* "/c" */ + # endif + +@@ -2911,19 +2911,28 @@ construct_command_argv_internal (char *line, char **restp, char *shell, + + new_argv = xmalloc (4 * sizeof (char *)); + new_argv[0] = xstrdup(shell); +- new_argv[1] = xstrdup(shellflags); ++ new_argv[1] = xstrdup(shellflags ? shellflags : ""); + new_argv[2] = line; + new_argv[3] = NULL; + return new_argv; + } + +- new_line = alloca (shell_len + 1 + sflags_len + 1 ++ new_line = alloca ((shell_len*2) + 1 + sflags_len + 1 + + (line_len*2) + 1); + ap = new_line; +- memcpy (ap, shell, shell_len); +- ap += shell_len; ++ /* Copy SHELL, escaping any characters special to the shell. If ++ we don't escape them, construct_command_argv_internal will ++ recursively call itself ad nauseam, or until stack overflow, ++ whichever happens first. */ ++ for (p = shell; *p != '\0'; ++p) ++ { ++ if (strchr (sh_chars, *p) != 0) ++ *(ap++) = '\\'; ++ *(ap++) = *p; ++ } + *(ap++) = ' '; +- memcpy (ap, shellflags, sflags_len); ++ if (shellflags) ++ memcpy (ap, shellflags, sflags_len); + ap += sflags_len; + *(ap++) = ' '; + command_ptr = ap; +-- +1.7.12 + diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-copy-on-expand.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-copy-on-expand.patch new file mode 100644 index 0000000000..3f202b4db9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-copy-on-expand.patch @@ -0,0 +1,58 @@ +fix from upstream cvs + +---------------------------- +revision 1.58 +date: 2011-08-29 12:20:19 -0400; author: psmith; state: Exp; lines: +7 -13; commitid: MdH0jSxpuIy7mqxv; +Save strings we're expanding in case an embedded eval causes them +to be freed (if they're the value of a variable that's reset for example). +See Savannah patch #7534 + +Index: expand.c +=================================================================== +RCS file: /sources/make/make/expand.c,v +retrieving revision 1.57 +retrieving revision 1.58 +diff -u -p -r1.57 -r1.58 +--- expand.c 7 May 2011 20:03:49 -0000 1.57 ++++ expand.c 29 Aug 2011 16:20:19 -0000 1.58 +@@ -197,7 +197,7 @@ variable_expand_string (char *line, cons + { + struct variable *v; + const char *p, *p1; +- char *abuf = NULL; ++ char *save; + char *o; + unsigned int line_offset; + +@@ -212,16 +212,11 @@ variable_expand_string (char *line, cons + return (variable_buffer); + } + +- /* If we want a subset of the string, allocate a temporary buffer for it. +- Most of the functions we use here don't work with length limits. */ +- if (length > 0 && string[length] != '\0') +- { +- abuf = xmalloc(length+1); +- memcpy(abuf, string, length); +- abuf[length] = '\0'; +- string = abuf; +- } +- p = string; ++ /* We need a copy of STRING: due to eval, it's possible that it will get ++ freed as we process it (it might be the value of a variable that's reset ++ for example). Also having a nil-terminated string is handy. */ ++ save = length < 0 ? xstrdup (string) : xstrndup (string, length); ++ p = save; + + while (1) + { +@@ -411,8 +406,7 @@ variable_expand_string (char *line, cons + ++p; + } + +- if (abuf) +- free (abuf); ++ free (save); + + variable_buffer_output (o, "", 1); + return (variable_buffer + line_offset); diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch new file mode 100644 index 0000000000..de7e4f6152 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch @@ -0,0 +1,17 @@ +Fixed default libpatttern on Darwin, imported from prefix overlay. +Got merged upstream: +https://savannah.gnu.org/bugs/?37197 +--- default.c.orig 2009-05-02 12:25:24 +0200 ++++ default.c 2009-05-02 12:25:58 +0200 +@@ -509,7 +509,11 @@ + #ifdef __MSDOS__ + ".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a", + #else ++#ifdef __APPLE__ ++ ".LIBPATTERNS", "lib%.dylib lib%.a", ++#else + ".LIBPATTERNS", "lib%.so lib%.a", ++#endif + #endif + #endif + diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-glob-speedup.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-glob-speedup.patch new file mode 100644 index 0000000000..c826c2c0e1 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-glob-speedup.patch @@ -0,0 +1,104 @@ +change from upstream to speed up by skipping unused globs +https://bugs.gentoo.org/382845 + +http://cvs.savannah.gnu.org/viewvc/make/read.c?root=make&r1=1.198&r2=1.200 + +Revision 1.200 +Sat May 7 14:36:12 2011 UTC (4 months, 1 week ago) by psmith +Branch: MAIN +Changes since 1.199: +1 -1 lines +Inverted the boolean test from what I wanted it to be. Added a +regression test to make sure this continues to work. + +Revision 1.199 +Mon May 2 00:18:06 2011 UTC (4 months, 2 weeks ago) by psmith +Branch: MAIN +Changes since 1.198: +35 -25 lines +Avoid invoking glob() unless the filename has potential globbing +characters in it, for performance improvements. + +--- a/read.c 2011/04/29 15:27:39 1.198 ++++ b/read.c 2011/05/07 14:36:12 1.200 +@@ -2901,6 +2901,7 @@ + const char *name; + const char **nlist = 0; + char *tildep = 0; ++ int globme = 1; + #ifndef NO_ARCHIVES + char *arname = 0; + char *memname = 0; +@@ -3109,32 +3110,40 @@ + } + #endif /* !NO_ARCHIVES */ + +- switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl)) +- { +- case GLOB_NOSPACE: +- fatal (NILF, _("virtual memory exhausted")); +- +- case 0: +- /* Success. */ +- i = gl.gl_pathc; +- nlist = (const char **)gl.gl_pathv; +- break; +- +- case GLOB_NOMATCH: +- /* If we want only existing items, skip this one. */ +- if (flags & PARSEFS_EXISTS) +- { +- i = 0; +- break; +- } +- /* FALLTHROUGH */ +- +- default: +- /* By default keep this name. */ ++ /* glob() is expensive: don't call it unless we need to. */ ++ if (!(flags & PARSEFS_EXISTS) && strpbrk (name, "?*[") == NULL) ++ { ++ globme = 0; + i = 1; + nlist = &name; +- break; +- } ++ } ++ else ++ switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl)) ++ { ++ case GLOB_NOSPACE: ++ fatal (NILF, _("virtual memory exhausted")); ++ ++ case 0: ++ /* Success. */ ++ i = gl.gl_pathc; ++ nlist = (const char **)gl.gl_pathv; ++ break; ++ ++ case GLOB_NOMATCH: ++ /* If we want only existing items, skip this one. */ ++ if (flags & PARSEFS_EXISTS) ++ { ++ i = 0; ++ break; ++ } ++ /* FALLTHROUGH */ ++ ++ default: ++ /* By default keep this name. */ ++ i = 1; ++ nlist = &name; ++ break; ++ } + + /* For each matched element, add it to the list. */ + while (i-- > 0) +@@ -3174,7 +3183,8 @@ + #endif /* !NO_ARCHIVES */ + NEWELT (concat (2, prefix, nlist[i])); + +- globfree (&gl); ++ if (globme) ++ globfree (&gl); + + #ifndef NO_ARCHIVES + if (arname) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-intermediate-parallel.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-intermediate-parallel.patch new file mode 100644 index 0000000000..df9b8d475b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-intermediate-parallel.patch @@ -0,0 +1,62 @@ +https://savannah.gnu.org/bugs/?30653 +https://bugs.gentoo.org/431250 + +From d1ba0ee36b2bdd91434b5df90f0f4cceda7d6979 Mon Sep 17 00:00:00 2001 +From: psmith +Date: Mon, 10 Sep 2012 02:36:05 +0000 +Subject: [PATCH] Force intermediate targets to be considered if their + non-intermediate parent needs to be remade. Fixes Savannah + bug #30653. + +--- + ChangeLog | 4 ++++ + remake.c | 4 ++++ + tests/scripts/features/parallelism | 17 +++++++++++++++++ + 3 files changed, 25 insertions(+) + +diff --git a/remake.c b/remake.c +index c0bf709..b1ddd23 100644 +--- a/remake.c ++++ b/remake.c +@@ -612,6 +612,10 @@ update_file_1 (struct file *file, unsigned int depth) + d->file->dontcare = file->dontcare; + } + ++ /* We may have already considered this file, when we didn't know ++ we'd need to update it. Force update_file() to consider it and ++ not prune it. */ ++ d->file->considered = !considered; + + dep_status |= update_file (d->file, depth); + +diff --git a/tests/scripts/features/parallelism b/tests/scripts/features/parallelism +index d4250f0..76d24a7 100644 +--- a/tests/scripts/features/parallelism ++++ b/tests/scripts/features/parallelism +@@ -214,6 +214,23 @@ rm main.x"); + rmfiles(qw(foo.y foo.y.in main.bar)); + } + ++# Ensure intermediate/secondary files are not pruned incorrectly. ++# See Savannah bug #30653 ++ ++utouch(-15, 'file2'); ++utouch(-10, 'file4'); ++utouch(-5, 'file1'); ++ ++run_make_test(q! ++.INTERMEDIATE: file3 ++file4: file3 ; @mv -f $< $@ ++file3: file2 ; touch $@ ++file2: file1 ; @touch $@ ++!, ++ '--no-print-directory -j2', "touch file3"); ++ ++#rmfiles('file1', 'file2', 'file3', 'file4'); ++ + if ($all_tests) { + # Jobserver FD handling is messed up in some way. + # Savannah bug #28189 +-- +1.7.12 + diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-long-command-line.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-long-command-line.patch new file mode 100644 index 0000000000..9266786e4d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-long-command-line.patch @@ -0,0 +1,54 @@ +https://savannah.gnu.org/bugs/?36451 + +From a95796de3a491d8acfc8ea94c217b90531161786 Mon Sep 17 00:00:00 2001 +From: psmith +Date: Sun, 9 Sep 2012 23:25:07 +0000 +Subject: [PATCH] Keep the command line on the heap to avoid stack overflow. + Fixes Savannah bug #36451. + +--- + ChangeLog | 3 +++ + job.c | 13 +++++++++---- + 2 files changed, 12 insertions(+), 4 deletions(-) + +diff --git a/job.c b/job.c +index 754576b..f7b7d51 100644 +--- a/job.c ++++ b/job.c +@@ -2984,8 +2984,8 @@ construct_command_argv_internal (char *line, char **restp, char *shell, + return new_argv; + } + +- new_line = alloca ((shell_len*2) + 1 + sflags_len + 1 +- + (line_len*2) + 1); ++ new_line = xmalloc ((shell_len*2) + 1 + sflags_len + 1 ++ + (line_len*2) + 1); + ap = new_line; + /* Copy SHELL, escaping any characters special to the shell. If + we don't escape them, construct_command_argv_internal will +@@ -3052,8 +3052,11 @@ construct_command_argv_internal (char *line, char **restp, char *shell, + *ap++ = *p; + } + if (ap == new_line + shell_len + sflags_len + 2) +- /* Line was empty. */ +- return 0; ++ { ++ /* Line was empty. */ ++ free (new_line); ++ return 0; ++ } + *ap = '\0'; + + #ifdef WINDOWS32 +@@ -3194,6 +3197,8 @@ construct_command_argv_internal (char *line, char **restp, char *shell, + fatal (NILF, _("%s (line %d) Bad shell context (!unixy && !batch_mode_shell)\n"), + __FILE__, __LINE__); + #endif ++ ++ free (new_line); + } + #endif /* ! AMIGA */ + +-- +1.7.12 + diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-oneshell.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-oneshell.patch new file mode 100644 index 0000000000..fbade127ce --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-oneshell.patch @@ -0,0 +1,24 @@ +fix from upstream cvs + +---------------------------- +revision 1.245 +date: 2010-08-13 22:50:14 -0400; author: psmith; state: Exp; lines: +1 -1; commitid: 4UaslPqQHZTs5wKu; +- Add oneshell to $(.FEATURES) (forgot that!) + +Index: main.c +=================================================================== +RCS file: /sources/make/make/main.c,v +retrieving revision 1.244 +retrieving revision 1.245 +diff -u -p -r1.244 -r1.245 +--- main.c 10 Aug 2010 07:35:34 -0000 1.244 ++++ main.c 14 Aug 2010 02:50:14 -0000 1.245 +@@ -1138,7 +1138,7 @@ main (int argc, char **argv, char **envp + a macro and some compilers (MSVC) don't like conditionals in macros. */ + { + const char *features = "target-specific order-only second-expansion" +- " else-if shortest-stem undefine" ++ " else-if shortest-stem undefine oneshell" + #ifndef NO_ARCHIVES + " archives" + #endif diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-parallel-remake.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-parallel-remake.patch new file mode 100644 index 0000000000..a19fe7b7d6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-parallel-remake.patch @@ -0,0 +1,39 @@ +fix from upstream cvs + +---------------------------- +revision 1.247 +date: 2011-09-18 19:39:26 -0400; author: psmith; state: Exp; lines: +5 -3; commitid: 07NxO4T5PiWC82Av; +When we re-exec the master makefile in a jobserver environment, ensure +that MAKEFLAGS is set properly so the re-exec'd make runs in parallel. +See Savannah bug #33873. + +Index: main.c +=================================================================== +RCS file: /sources/make/make/main.c,v +retrieving revision 1.246 +retrieving revision 1.247 +diff -u -p -r1.246 -r1.247 +--- main.c 29 Aug 2010 23:05:27 -0000 1.246 ++++ main.c 18 Sep 2011 23:39:26 -0000 1.247 +@@ -2089,6 +2089,11 @@ main (int argc, char **argv, char **envp + + ++restarts; + ++ /* If we're re-exec'ing the first make, put back the number of ++ job slots so define_makefiles() will get it right. */ ++ if (master_job_slots) ++ job_slots = master_job_slots; ++ + /* Reset makeflags in case they were changed. */ + { + const char *pv = define_makeflags (1, 1); +@@ -2825,9 +2830,6 @@ define_makeflags (int all, int makefile) + && (*(unsigned int *) cs->value_ptr == + *(unsigned int *) cs->noarg_value)) + ADD_FLAG ("", 0); /* Optional value omitted; see below. */ +- else if (cs->c == 'j') +- /* Special case for `-j'. */ +- ADD_FLAG ("1", 1); + else + { + char *buf = alloca (30); diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.80-r4.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.80-r4.ebuild new file mode 100644 index 0000000000..45390cc555 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.80-r4.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.80-r4.ebuild,v 1.12 2011/02/06 11:37:17 leio Exp $ + +inherit eutils flag-o-matic + +DESCRIPTION="Standard tool to compile source trees" +HOMEPAGE="http://www.gnu.org/software/make/make.html" +SRC_URI="ftp://ftp.gnu.org/gnu/make/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +IUSE="nls static" + +DEPEND="nls? ( sys-devel/gettext )" +RDEPEND="" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PV}-memory.patch + epatch "${FILESDIR}"/${P}-parallel-build-failure.patch + epatch "${FILESDIR}"/${P}-conditional-eval.patch #123317 +} + +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 + dosym gmake /usr/bin/make + dosym gmake.1 /usr/share/man/man1/make.1 + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.81-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.81-r1.ebuild new file mode 100644 index 0000000000..8791da4000 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.81-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.81-r1.ebuild,v 1.2 2012/05/24 02:38:35 vapier Exp $ + +inherit flag-o-matic eutils + +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 +} + +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 +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.81-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.81-r2.ebuild new file mode 100644 index 0000000000..afb318c059 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.81-r2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2012 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.10 2012/05/24 02:38:35 vapier Exp $ + +inherit flag-o-matic eutils + +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 + epatch "${FILESDIR}"/${P}-tests-recursion.patch #329153 + epatch "${FILESDIR}"/${P}-jobserver.patch #193258 +} + +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 +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.81.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.81.ebuild new file mode 100644 index 0000000000..3207e2c309 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.81.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.81.ebuild,v 1.15 2012/05/24 02:38:35 vapier Exp $ + +inherit flag-o-matic eutils + +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 +} + +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 +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.82-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.82-r1.ebuild index e939526484..671f0109c9 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.82-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.82-r1.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-devel/make/make-3.82-r1.ebuild,v 1.1 2011/06/07 13:18:10 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.82-r1.ebuild,v 1.8 2011/12/30 15:46:43 halcy0n Exp $ EAPI="2" diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.82-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.82-r3.ebuild new file mode 100644 index 0000000000..c97375c7ab --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.82-r3.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.82-r3.ebuild,v 1.8 2012/09/02 18:52:35 armin76 Exp $ + +EAPI="2" + +inherit flag-o-matic eutils + +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-3" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="nls static" + +DEPEND="nls? ( sys-devel/gettext )" +RDEPEND="nls? ( virtual/libintl )" + +src_prepare() { + epatch "${FILESDIR}"/${P}-archives-many-objs.patch #334889 + epatch "${FILESDIR}"/${P}-MAKEFLAGS-reexec.patch #31975 + epatch "${FILESDIR}"/${P}-memory-corruption.patch #355907 + epatch "${FILESDIR}"/${P}-glob-speedup.patch #382845 +} + +src_configure() { + use static && append-ldflags -static + econf \ + --program-prefix=g \ + $(use_enable nls) +} + +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 +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.82-r4.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.82-r4.ebuild new file mode 100644 index 0000000000..7b2bd9e72c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.82-r4.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.82-r4.ebuild,v 1.15 2013/02/19 03:00:42 zmedico Exp $ + +EAPI="2" + +inherit flag-o-matic eutils + +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-3" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls static" + +DEPEND="nls? ( sys-devel/gettext )" +RDEPEND="nls? ( virtual/libintl )" + +src_prepare() { + epatch "${FILESDIR}"/${P}-archives-many-objs.patch #334889 + epatch "${FILESDIR}"/${P}-MAKEFLAGS-reexec.patch #31975 + epatch "${FILESDIR}"/${P}-memory-corruption.patch #355907 + epatch "${FILESDIR}"/${P}-glob-speedup.patch #382845 + epatch "${FILESDIR}"/${P}-copy-on-expand.patch + epatch "${FILESDIR}"/${P}-oneshell.patch + epatch "${FILESDIR}"/${P}-parallel-remake.patch + epatch "${FILESDIR}"/${P}-intermediate-parallel.patch #431250 + epatch "${FILESDIR}"/${P}-construct-command-line.patch + epatch "${FILESDIR}"/${P}-long-command-line.patch + epatch "${FILESDIR}"/${P}-darwin-library_search-dylib.patch +} + +src_configure() { + use static && append-ldflags -static + econf \ + --program-prefix=g \ + $(use_enable nls) +} + +src_install() { + emake DESTDIR="${D}" install || die + 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 +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.82.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.82.ebuild new file mode 100644 index 0000000000..e3cc1ef142 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.82.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/make-3.82.ebuild,v 1.11 2011/07/09 09:17:29 xarthisius Exp $ + +EAPI="2" + +inherit flag-o-matic eutils + +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-3" +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_prepare() { + epatch "${FILESDIR}"/${P}-archives-many-objs.patch #334889 + epatch "${FILESDIR}"/${P}-MAKEFLAGS-reexec.patch #31975 +} + +src_configure() { + use static && append-ldflags -static + econf \ + --program-prefix=g \ + $(use_enable nls) +} + +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 +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-devel/make/metadata.xml new file mode 100644 index 0000000000..96a2d58636 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/metadata.xml @@ -0,0 +1,5 @@ + + + +base-system +