From 599a424dde4734baf28dadaef33ff32b5afee4f2 Mon Sep 17 00:00:00 2001 From: David Michael Date: Sat, 19 Jan 2019 22:17:00 +0000 Subject: [PATCH] bump(sys-devel/make): sync with upstream --- .../metadata/md5-cache/sys-devel/make-3.80-r4 | 12 - .../metadata/md5-cache/sys-devel/make-3.81-r2 | 13 - .../metadata/md5-cache/sys-devel/make-4.0-r1 | 13 - .../metadata/md5-cache/sys-devel/make-4.1-r1 | 13 - .../sys-devel/{make-3.82-r4 => make-4.2.1-r4} | 16 +- .../portage-stable/sys-devel/make/ChangeLog | 103 ---- .../sys-devel/make/ChangeLog-2015 | 517 ------------------ .../portage-stable/sys-devel/make/Manifest | 34 +- .../sys-devel/make/files/3.80-memory.patch | 77 --- .../files/make-3.80-conditional-eval.patch | 157 ------ .../make-3.80-parallel-build-failure.patch | 59 -- .../make/files/make-3.81-jobserver.patch | 19 - .../make/files/make-3.81-long-cmdline.patch | 100 ---- .../make/files/make-3.81-tests-lang.patch | 55 -- .../files/make-3.81-tests-recursion.patch | 14 - .../files/make-3.82-MAKEFLAGS-reexec.patch | 14 - .../files/make-3.82-archives-many-objs.patch | 60 -- .../make-3.82-construct-command-line.patch | 71 --- .../make/files/make-3.82-copy-on-expand.patch | 58 -- ...ake-3.82-darwin-library_search-dylib.patch | 4 +- .../make/files/make-3.82-glob-speedup.patch | 104 ---- .../make-3.82-intermediate-parallel.patch | 62 --- .../files/make-3.82-long-command-line.patch | 54 -- .../files/make-3.82-memory-corruption.patch | 37 -- .../make/files/make-3.82-oneshell.patch | 24 - .../files/make-3.82-parallel-remake.patch | 39 -- .../make/files/make-4.0-char-cast.patch | 46 -- ...ke-4.1-fix_null_returns_from_ttyname.patch | 53 -- .../make/files/make-4.2-default-cxx.patch | 13 + .../files/make-4.2.1-glob-internals.patch | 67 +++ .../make/files/make-4.2.1-glob-v2.patch | 30 + .../make/files/make-4.2.1-guile-2.2.patch | 320 +++++++++++ .../make/files/make-4.2.1-perl526.patch | 26 + .../make-4.2.1-pselect-non-blocking.patch | 172 ++++++ .../sys-devel/make/make-3.80-r4.ebuild | 43 -- .../sys-devel/make/make-3.81-r2.ebuild | 46 -- .../sys-devel/make/make-3.82-r4.ebuild | 51 -- .../sys-devel/make/make-4.0-r1.ebuild | 47 -- .../sys-devel/make/make-4.1-r1.ebuild | 47 -- .../sys-devel/make/make-4.2.1-r4.ebuild | 59 ++ 40 files changed, 698 insertions(+), 2051 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/make-3.80-r4 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/make-3.81-r2 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/make-4.0-r1 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/make-4.1-r1 rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/{make-3.82-r4 => make-4.2.1-r4} (58%) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/ChangeLog delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/ChangeLog-2015 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/3.80-memory.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.80-conditional-eval.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.80-parallel-build-failure.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.81-jobserver.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.81-long-cmdline.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.81-tests-lang.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.81-tests-recursion.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-MAKEFLAGS-reexec.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-archives-many-objs.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-construct-command-line.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-copy-on-expand.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-glob-speedup.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-intermediate-parallel.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-long-command-line.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-memory-corruption.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-oneshell.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-parallel-remake.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.0-char-cast.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.1-fix_null_returns_from_ttyname.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2-default-cxx.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2.1-glob-internals.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2.1-glob-v2.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2.1-guile-2.2.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2.1-perl526.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2.1-pselect-non-blocking.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.80-r4.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.81-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.82-r4.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/make-4.0-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/make-4.1-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/make/make-4.2.1-r4.ebuild diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/make-3.80-r4 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/make-3.80-r4 deleted file mode 100644 index 3d53563ea1..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/make-3.80-r4 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install unpack -DEPEND=nls? ( sys-devel/gettext ) -DESCRIPTION=Standard tool to compile source trees -EAPI=0 -HOMEPAGE=https://www.gnu.org/software/make/make.html -IUSE=nls static -KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd -LICENSE=GPL-2 -SLOT=0 -SRC_URI=mirror://gnu//make/make-3.80.tar.bz2 -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=a0bed9522756d66a87a113e2595df8a5 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/make-3.81-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/make-3.81-r2 deleted file mode 100644 index 2f456561bf..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/make-3.81-r2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install unpack -DEPEND=nls? ( sys-devel/gettext ) -DESCRIPTION=Standard tool to compile source trees -EAPI=0 -HOMEPAGE=https://www.gnu.org/software/make/make.html -IUSE=nls static -KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd -LICENSE=GPL-2 -RDEPEND=nls? ( virtual/libintl ) -SLOT=0 -SRC_URI=mirror://gnu//make/make-3.81.tar.bz2 -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=8ec69bd57a8484eaf440c2e48ff3a586 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/make-4.0-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/make-4.0-r1 deleted file mode 100644 index 1978a94fbb..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/make-4.0-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=configure install prepare -DEPEND=guile? ( >=dev-scheme/guile-1.8 ) nls? ( sys-devel/gettext ) -DESCRIPTION=Standard tool to compile source trees -EAPI=4 -HOMEPAGE=https://www.gnu.org/software/make/make.html -IUSE=guile nls static -KEYWORDS=alpha amd64 arm arm64 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 -LICENSE=GPL-3+ -RDEPEND=guile? ( >=dev-scheme/guile-1.8 ) nls? ( virtual/libintl ) -SLOT=0 -SRC_URI=mirror://gnu//make/make-4.0.tar.bz2 -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=79dd231c01fb9b62bfef575a01fda613 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/make-4.1-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/make-4.1-r1 deleted file mode 100644 index acd87fd331..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/make-4.1-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=configure install prepare -DEPEND=guile? ( >=dev-scheme/guile-1.8 ) nls? ( sys-devel/gettext ) -DESCRIPTION=Standard tool to compile source trees -EAPI=4 -HOMEPAGE=https://www.gnu.org/software/make/make.html -IUSE=guile nls static -KEYWORDS=alpha amd64 arm arm64 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 -LICENSE=GPL-3+ -RDEPEND=guile? ( >=dev-scheme/guile-1.8 ) nls? ( virtual/libintl ) -SLOT=0 -SRC_URI=mirror://gnu//make/make-4.1.tar.bz2 -_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=1bfc7a05e98309e995e67fa2d6d99fd0 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/make-3.82-r4 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/make-4.2.1-r4 similarity index 58% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/make-3.82-r4 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/make-4.2.1-r4 index cd45332a08..32812d4165 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/make-3.82-r4 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/sys-devel/make-4.2.1-r4 @@ -1,13 +1,13 @@ DEFINED_PHASES=configure install prepare -DEPEND=nls? ( sys-devel/gettext ) +DEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( sys-devel/gettext ) DESCRIPTION=Standard tool to compile source trees -EAPI=2 +EAPI=6 HOMEPAGE=https://www.gnu.org/software/make/make.html -IUSE=nls static -KEYWORDS=alpha amd64 arm arm64 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 -LICENSE=GPL-3 -RDEPEND=nls? ( virtual/libintl ) +IUSE=guile nls static +KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=GPL-3+ +RDEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl ) SLOT=0 -SRC_URI=mirror://gnu//make/make-3.82.tar.bz2 +SRC_URI=mirror://gnu//make/make-4.2.1.tar.bz2 _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=f47aa56974535ef90ac944cdc3840b73 +_md5_=8545ed3ffe857087c418a4b6f9248e8a 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 deleted file mode 100644 index e3a6873fa0..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/ChangeLog +++ /dev/null @@ -1,103 +0,0 @@ -# ChangeLog for sys-devel/make -# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 -# (auto-generated from git log) - -*make-4.1-r1 (09 Aug 2015) -*make-4.0-r1 (09 Aug 2015) -*make-3.82-r4 (09 Aug 2015) -*make-3.81-r2 (09 Aug 2015) -*make-3.80-r4 (09 Aug 2015) - - 09 Aug 2015; Robin H. Johnson +files/3.80-memory.patch, - +files/make-3.80-conditional-eval.patch, - +files/make-3.80-parallel-build-failure.patch, - +files/make-3.81-jobserver.patch, +files/make-3.81-long-cmdline.patch, - +files/make-3.81-tests-lang.patch, +files/make-3.81-tests-recursion.patch, - +files/make-3.82-MAKEFLAGS-reexec.patch, - +files/make-3.82-archives-many-objs.patch, - +files/make-3.82-construct-command-line.patch, - +files/make-3.82-copy-on-expand.patch, - +files/make-3.82-darwin-library_search-dylib.patch, - +files/make-3.82-glob-speedup.patch, - +files/make-3.82-intermediate-parallel.patch, - +files/make-3.82-long-command-line.patch, - +files/make-3.82-memory-corruption.patch, +files/make-3.82-oneshell.patch, - +files/make-3.82-parallel-remake.patch, +files/make-4.0-char-cast.patch, - +files/make-4.1-fix_null_returns_from_ttyname.patch, +make-3.80-r4.ebuild, - +make-3.81-r2.ebuild, +make-3.82-r4.ebuild, +make-4.0-r1.ebuild, - +make-4.1-r1.ebuild, +metadata.xml: - proj/gentoo: Initial commit - - This commit represents a new era for Gentoo: - Storing the gentoo-x86 tree in Git, as converted from CVS. - - This commit is the start of the NEW history. - Any historical data is intended to be grafted onto this point. - - Creation process: - 1. Take final CVS checkout snapshot - 2. Remove ALL ChangeLog* files - 3. Transform all Manifests to thin - 4. Remove empty Manifests - 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ - 5.1. Do not touch files with -kb/-ko keyword flags. - - Signed-off-by: Robin H. Johnson - X-Thanks: Alec Warner - did the GSoC 2006 migration - tests - X-Thanks: Robin H. Johnson - infra guy, herding this - project - X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo - developer, wrote Git features for the migration - X-Thanks: Brian Harring - wrote much python to improve - cvs2svn - X-Thanks: Rich Freeman - validation scripts - X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 - work in migration - X-Thanks: Michał Górny - scripts, QA, nagging - X-Thanks: All of other Gentoo developers - many ideas and lots of paint on - the bikeshed - - 24 Aug 2015; Justin Lecher metadata.xml: - Use https by default - - Convert all URLs for sites supporting encrypted connections from http to - https - - Signed-off-by: Justin Lecher - - 24 Aug 2015; Justin Lecher make-3.80-r4.ebuild, - make-3.81-r2.ebuild, make-3.82-r4.ebuild, make-4.0-r1.ebuild, - make-4.1-r1.ebuild: - Use https for most gnu.org URLs - - Signed-off-by: Justin Lecher - - 24 Aug 2015; Mike Gilbert metadata.xml: - Revert DOCTYPE SYSTEM https changes in metadata.xml - - repoman does not yet accept the https version. - This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450. - - Bug: https://bugs.gentoo.org/552720 - - 24 Nov 2015; Mike Frysinger metadata.xml: - standardize various metadata.xml style - - 24 Jan 2016; Michał Górny metadata.xml: - Unify quoting in metadata.xml files for machine processing - - Force unified quoting in all metadata.xml files since lxml does not - preserve original use of single and double quotes. Ensuring unified - quoting before the process allows distinguishing the GLEP 67-related - metadata.xml changes from unrelated quoting changes. - - 24 Jan 2016; Michał Górny metadata.xml: - Replace all herds with appropriate projects (GLEP 67) - - Replace all uses of herd with appropriate project maintainers, or no - maintainers in case of herds requested to be disbanded. - - 24 Jan 2016; Michał Górny metadata.xml: - Set appropriate maintainer types in metadata.xml (GLEP 67) - diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/ChangeLog-2015 b/sdk_container/src/third_party/portage-stable/sys-devel/make/ChangeLog-2015 deleted file mode 100644 index 48fd5e5ecd..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/ChangeLog-2015 +++ /dev/null @@ -1,517 +0,0 @@ -# ChangeLog for sys-devel/make -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/make/ChangeLog,v 1.142 2015/04/04 22:26:05 vapier Exp $ - - 04 Apr 2015; Mike Frysinger make-4.1-r1.ebuild: - Mark arm64/m68k/s390/sh stable. - - 29 Mar 2015; Mikle Kolyada make-4.1-r1.ebuild: - ppc64 stable wrt bug #540868 - - 24 Mar 2015; Markus Meier make-4.1-r1.ebuild: - arm stable, bug #540868 - - 16 Mar 2015; Matt Turner make-4.1-r1.ebuild: - alpha stable, bug 540868. - - 06 Mar 2015; Jeroen Roovers make-4.1-r1.ebuild: - Stable for HPPA (bug #540868). - - 02 Mar 2015; Agostino Sarubbo make-4.1-r1.ebuild: - Stable for ppc, wrt bug #540868 - - 28 Feb 2015; Agostino Sarubbo make-4.1-r1.ebuild: - Stable for ia64, wrt bug #540868 - - 27 Feb 2015; Agostino Sarubbo make-4.1-r1.ebuild: - Stable for sparc, wrt bug #540868 - - 25 Feb 2015; Mikle Kolyada make-4.1-r1.ebuild: - x86 stable wrt bug #540868 - - 25 Feb 2015; Mikle Kolyada make-4.1-r1.ebuild: - amd64 stable wrt bug #540868 - - 23 Nov 2014; Mikle Kolyada make-4.0-r1.ebuild: - ppc64 stable wrt bug #524530 - - 23 Nov 2014; Mikle Kolyada make-4.0-r1.ebuild: - alpha stable wrt bug #524530 - - 11 Nov 2014; Agostino Sarubbo make-4.0-r1.ebuild: - Stable for ia64, wrt bug #524530 - - 10 Nov 2014; Agostino Sarubbo make-4.0-r1.ebuild: - Stable for ppc, wrt bug #524530 - - 04 Nov 2014; Agostino Sarubbo make-4.0-r1.ebuild: - Stable for sparc, wrt bug #524530 - - 03 Nov 2014; Mike Frysinger make-4.0-r1.ebuild: - Mark arm64/m68k/s390/sh stable. - - 03 Nov 2014; Mike Frysinger make-3.80-r4.ebuild: - Update SRC_URI to use GNU mirror. - - 03 Nov 2014; Mike Frysinger make-3.80-r4.ebuild: - Update SRC_URI to use GNU mirror. - -*make-4.1-r1 (20 Oct 2014) - - 20 Oct 2014; Lars Wendler -make-4.1.ebuild, - +make-4.1-r1.ebuild, +files/make-4.1-fix_null_returns_from_ttyname.patch: - Revbump to fix a segfault when running make without /dev/pts being mounted - (bug #525546). - - 16 Oct 2014; Markus Meier make-4.0-r1.ebuild: - arm stable, bug #524530 - - 10 Oct 2014; Agostino Sarubbo make-4.0-r1.ebuild: - Stable for x86, wrt bug #524530 - - 05 Oct 2014; Jeroen Roovers make-4.0-r1.ebuild: - Stable for HPPA (bug #524530). - - 05 Oct 2014; Mikle Kolyada make-4.0-r1.ebuild: - amd64 stable wrt bug #524530 - -*make-4.1 (05 Oct 2014) - - 05 Oct 2014; Lars Wendler +make-4.1.ebuild: - Version bump. - - 18 Jan 2014; Mike Frysinger make-3.82-r4.ebuild, - make-4.0-r1.ebuild: - Add arm64 love. - - 07 Jan 2014; Lars Wendler -make-3.81.ebuild, - -make-3.81-r1.ebuild, -make-3.82.ebuild, -make-3.82-r1.ebuild, - -make-3.82-r3.ebuild, -make-4.0.ebuild, make-4.0-r1.ebuild: - Removed old versions and files. Converted latest ebuild to EAPI-4. - -*make-4.0-r1 (13 Dec 2013) - - 13 Dec 2013; Samuli Suominen - +files/make-4.0-char-cast.patch, +make-4.0-r1.ebuild: - Fix parsing problem of certain utf-8 encoded Makefiles using upstream patch. - One of those reasons you'd get "*** missing separator. Stop." message. - -*make-4.0 (13 Oct 2013) - - 13 Oct 2013; Lars Wendler +make-4.0.ebuild: - Version bump (bug #487444). - - 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 f1d68e208d..7ce526e76c 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,33 +1 @@ -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 -AUX make-4.0-char-cast.patch 1398 SHA256 bca7308b8e773ff8ae0db76d45060492775987114318152e6f1224c417e63001 SHA512 28d8061550b257a1712a9dcfbc6322cca95b8f5a42ca11646a68e3b8015bc4a687c608485c47cc8f1715b9aa5ea056be1a24bdea5839bca2a03e75ef193261e0 WHIRLPOOL 1ea1fe58ed70ccc202b25988befe9bead39a1100dbd4daf82a749011dcdcfa6e89816d30c418b6b6844e6389b8f66f48647749c8877afbc02ad708b572c31b32 -AUX make-4.1-fix_null_returns_from_ttyname.patch 1888 SHA256 325db153f75e680de29fb05f6e341ebfde4f68f1b7fcc3ace602f30b07bafd5b SHA512 47eb22909be25618fbc120fe5b844207989135101ada960c69557f898b2345c52a25fc329945324cd968f19fc3835330d939cf4ec2faf5ccf5c54e20dc02a1da WHIRLPOOL 4d4920a02a59cbce9584857ced89139f60fd817ad1e0ab90eefc15328b4d7073f61063eafa21ac101574ae05ada24a789df89ba4045963de1c0746ddf9fae513 -DIST make-3.80.tar.bz2 920645 SHA256 a99b39e7b04c333724f48c38fede709481cfb69fafe7e32ae4285b7fadf92f1b SHA512 aadabe1f6a3acd438597b24465e06e34343fb020b4ca9336d2aa5b572ce530622785dde8215b3f4332ff75928f72c269b9b83dfecf470f522285e27109b7bdfd WHIRLPOOL 4564dd28addd0817e47e8e89b8eff6af601050a2b0062b9e6df0b66945c7a426fa2cda4624b420d2f026440650ab5a95f6acd058deb7d2af00baa549fc19ea1e -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 -DIST make-4.0.tar.bz2 1341927 SHA256 e60686c7afede62cc8c86ad3012cf081ea4887daf9d223ce7115703b2bb2dbdb SHA512 82de265963cd08701491e02a4917cd2097762657257a9508119e5847050d0cb15580c163159463e822860435c5910190677d8e4aba644ba75df2895f26117376 WHIRLPOOL 96984c0493651bf27db3ddd6fadde25678e512d4d134fd7063cc5cd54bff6228543c98463835940e19e1cc79a67e22067c889efd460b355438670a4d42ce0d09 -DIST make-4.1.tar.bz2 1327342 SHA256 0bc7613389650ee6a24554b52572a272f7356164fd2c4132b0bcf13123e4fca5 SHA512 3fcaf06660b7a5019937b81ee69fe54cdfe0a24d66286fc5cc6a34fa996d76dfe6fd5bc49ee59b727ae2b24ddca261ada0fdb5873ba2b38dcc63647ad3cdb193 WHIRLPOOL 992ae4e6dc5e82bb4dc1b5c0840fbc519769114e61233c2d1cf9badfd0cf52a618fde290cef6cdc13d6c098aea9a67c414655513acefb1d44b031e14fe43d544 -EBUILD make-3.80-r4.ebuild 1031 SHA256 d825df76cc5cb19b6935d25db49e5db30fd51e5324c21634876e82e145c76a05 SHA512 91a5835f6377bb5eb773863eea0aae4dafe50638844279c18469ceae69708f195cda8da7b6aef22716877d22706b2b74b99e66435cd4b5c8852fe27f0ac1dda9 WHIRLPOOL 40ac1af1611edd1700d0d445476dc1a98d5a6896dfc1d24ee1d2e91d32f8aa200250bcca8e0fba0b89dc18121c0e0e43fe618e9a3033f93154c020fc3f35a583 -EBUILD make-3.81-r2.ebuild 1205 SHA256 a6cc6b23f02533a0f571cabfaa92e24676b51f46f2b57df575d285e5ca6fb24b SHA512 78959770c9a4e325f741d75430a1866eeb592252185c95bd789bc44ff3edbefa59ac3c17667ad9a0581eb49ef2af152a8e65086bf8cd863b38041235e8de9349 WHIRLPOOL 45c0a7d35c0c56e99fadc9a2f0c24780af676edb5ec861388a0a255bec1a5a0e3a2c5f3dba8d27c85ac6991e62ef1b6e508a0384467b3b365e83a71ed7f31bb2 -EBUILD make-3.82-r4.ebuild 1778 SHA256 e417a1aaed5635a38fcfcc7c097a096da3df508ad1b7e2432e3c7a239d1a1a74 SHA512 da3b3d65b83d001436187c34db51c25a2d103def3e581082a21f41fa856bedcf9b95dea70124f48409bb04148a2efabfc2001cd0663ba25bdbb9a151d37b08a4 WHIRLPOOL e5e45215d7722e65683848fe343f18c7c9714806b5edb29febe116cf85016ab28adb2ce4075083ca2629dc06ebd13d99094554eecfc8d042618f45eb80175fcf -EBUILD make-4.0-r1.ebuild 1376 SHA256 3f046124016c31ae346fbf95dbac1a9b3f5af0b9a4907db6d1292b289b3f86c7 SHA512 f1e52fcba1c6c763754ceccae962670d7437942f7afb8daca1c027ef534f39c43cd841baebf5e59f2e69720be5f953cabc21e975a1743a14c7258ceca71161ce WHIRLPOOL 1b9bb6ce1f953ec0e618fdbe115e9f4f941f5791cb1da88cf027bdd852e18fda72d33b9ed89ba381d919b4f6468280e4f9a3975b567335e45ba9bf6e6f75f63b -EBUILD make-4.1-r1.ebuild 1386 SHA256 5824f9f1c33e5cef96de5dd6607959c453400e478e28cf4b29e9ace55ba2a9ed SHA512 dceddb431333d9f3339dce93c5803c6dadb8ad522a25c8b6f98e9ae2e873cf89842196f7a718914bc92bf23cf4276a53821ee3f3cdf371f568dab217c3545323 WHIRLPOOL bf847914216dcd80129843e4095e93022df845e0ace6cbad020be25b5f1284e986927ffed2d539d8f1493f88a0abc0ac9197551115dcc8dd25f3b060b01819e5 -MISC ChangeLog 4197 SHA256 39918160182cfe3d2fecf5d438920e3fd66a79a144b515cbc809657238950e83 SHA512 0f18dabbb05a4f2573bae0477354becf5857bea2398c5f709aa97d854fd8211a425e9942bc55148219db4034bf7958c3a751dd6d7193d5ccf5b2b97e25df65c7 WHIRLPOOL 06de266d664966b534852f22069e93af590b2a8a6c326915c94d8031a2476f9a3bb4231cc0fabfe5cd53f5e64c1a7b81384b6e921efce5607150d7a1abffce31 -MISC ChangeLog-2015 18347 SHA256 1ae3c0c93f7f5c97fd21dd8890a4a9701802b08713e6c1ffe05ab48e21994ea1 SHA512 df210658a1d5036b7fe188834a66818343bf8f94716fffbfeeedd343ffa12d32d465bb7104753ef69b052c151458bbc21627009608e7ac28bcf843b50f265e75 WHIRLPOOL efcf138911b6d2bb39746997f1e75795b1a7cf3e448a5957418577d5d20b09df5cac68906e30d7ef8c299228d5b981379ccb5e9d483b68375d4347fb9a817f04 -MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8 +DIST make-4.2.1.tar.bz2 1407126 BLAKE2B fa6d43f5fd46182182a296c58dcd138a1a4568104eda760bbb3c241c023dee216789cf3128e5ac2b416cec76e1ba82d5b5e7852da12e86138a7d0865c85a42b4 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8 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 deleted file mode 100644 index 663acf52d7..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/3.80-memory.patch +++ /dev/null @@ -1,77 +0,0 @@ -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 deleted file mode 100644 index f4c1581f31..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.80-conditional-eval.patch +++ /dev/null @@ -1,157 +0,0 @@ -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 deleted file mode 100644 index 717e0f3556..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.80-parallel-build-failure.patch +++ /dev/null @@ -1,59 +0,0 @@ -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 deleted file mode 100644 index cd787ca769..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.81-jobserver.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index 9ceb5e8195..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.81-long-cmdline.patch +++ /dev/null @@ -1,100 +0,0 @@ -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 deleted file mode 100644 index f4e514712a..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.81-tests-lang.patch +++ /dev/null @@ -1,55 +0,0 @@ -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 deleted file mode 100644 index 490e2a912c..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.81-tests-recursion.patch +++ /dev/null @@ -1,14 +0,0 @@ -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-MAKEFLAGS-reexec.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-MAKEFLAGS-reexec.patch deleted file mode 100644 index a2f59657d4..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-MAKEFLAGS-reexec.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugs.gentoo.org/331975 -https://savannah.gnu.org/bugs/?30723 - ---- main.c 2010/07/19 07:10:53 1.243 -+++ main.c 2010/08/10 07:35:34 1.244 -@@ -2093,7 +2093,7 @@ - const char *pv = define_makeflags (1, 1); - char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); - sprintf (p, "MAKEFLAGS=%s", pv); -- putenv (p); -+ putenv (allocated_variable_expand (p)); - } - - if (ISDB (DB_BASIC)) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-archives-many-objs.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-archives-many-objs.patch deleted file mode 100644 index abdcd32280..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-archives-many-objs.patch +++ /dev/null @@ -1,60 +0,0 @@ -http://bugs.gentoo.org/334889 -https://savannah.gnu.org/bugs/?30612 - -revision 1.194 -date: 2010-08-13 22:50:14 -0400; author: psmith; state: Exp; lines: +9 -6; commitid: 4UaslPqQHZTs5wKu; -- Fix Savannah bug #30612: handling of archive references with >1 object - -Index: read.c -=================================================================== -RCS file: /sources/make/make/read.c,v -retrieving revision 1.193 -retrieving revision 1.194 -diff -u -p -r1.193 -r1.194 ---- read.c 13 Jul 2010 01:20:42 -0000 1.193 -+++ read.c 14 Aug 2010 02:50:14 -0000 1.194 -@@ -3028,7 +3028,7 @@ parse_file_seq (char **stringp, unsigned - { - /* This looks like the first element in an open archive group. - A valid group MUST have ')' as the last character. */ -- const char *e = p + nlen; -+ const char *e = p; - do - { - e = next_token (e); -@@ -3084,19 +3084,19 @@ parse_file_seq (char **stringp, unsigned - Go to the next item in the string. */ - if (flags & PARSEFS_NOGLOB) - { -- NEWELT (concat (2, prefix, tp)); -+ NEWELT (concat (2, prefix, tmpbuf)); - continue; - } - - /* If we get here we know we're doing glob expansion. - TP is a string in tmpbuf. NLEN is no longer used. - We may need to do more work: after this NAME will be set. */ -- name = tp; -+ name = tmpbuf; - - /* Expand tilde if applicable. */ -- if (tp[0] == '~') -+ if (tmpbuf[0] == '~') - { -- tildep = tilde_expand (tp); -+ tildep = tilde_expand (tmpbuf); - if (tildep != 0) - name = tildep; - } -@@ -3152,7 +3152,10 @@ parse_file_seq (char **stringp, unsigned - else - { - /* We got a chain of items. Attach them. */ -- (*newp)->next = found; -+ if (*newp) -+ (*newp)->next = found; -+ else -+ *newp = found; - - /* Find and set the new end. Massage names if necessary. */ - while (1) 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 deleted file mode 100644 index c504c45291..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-construct-command-line.patch +++ /dev/null @@ -1,71 +0,0 @@ -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 deleted file mode 100644 index 3f202b4db9..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-copy-on-expand.patch +++ /dev/null @@ -1,58 +0,0 @@ -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 index de7e4f6152..d2f60ec91c 100644 --- 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 @@ -1,8 +1,8 @@ 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 +--- a/default.c ++++ b/default.c @@ -509,7 +509,11 @@ #ifdef __MSDOS__ ".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a", 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 deleted file mode 100644 index c826c2c0e1..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-glob-speedup.patch +++ /dev/null @@ -1,104 +0,0 @@ -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 deleted file mode 100644 index df9b8d475b..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-intermediate-parallel.patch +++ /dev/null @@ -1,62 +0,0 @@ -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 deleted file mode 100644 index 9266786e4d..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-long-command-line.patch +++ /dev/null @@ -1,54 +0,0 @@ -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-memory-corruption.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-memory-corruption.patch deleted file mode 100644 index b28c07353e..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-memory-corruption.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- function.c 2011/04/18 01:25:20 1.121 -+++ function.c 2011/05/02 12:35:01 1.122 -@@ -706,7 +706,7 @@ - const char *word_iterator = argv[0]; - char buf[20]; - -- while (find_next_token (&word_iterator, (unsigned int *) 0) != 0) -+ while (find_next_token (&word_iterator, NULL) != 0) - ++i; - - sprintf (buf, "%d", i); -@@ -1133,21 +1133,14 @@ - - /* Find the maximum number of words we'll have. */ - t = argv[0]; -- wordi = 1; -- while (*t != '\0') -+ wordi = 0; -+ while ((p = find_next_token (&t, NULL)) != 0) - { -- char c = *(t++); -- -- if (! isspace ((unsigned char)c)) -- continue; -- -+ ++t; - ++wordi; -- -- while (isspace ((unsigned char)*t)) -- ++t; - } - -- words = xmalloc (wordi * sizeof (char *)); -+ words = xmalloc ((wordi == 0 ? 1 : wordi) * sizeof (char *)); - - /* Now assign pointers to each string in the array. */ - t = argv[0]; 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 deleted file mode 100644 index fbade127ce..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-oneshell.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 deleted file mode 100644 index a19fe7b7d6..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-3.82-parallel-remake.patch +++ /dev/null @@ -1,39 +0,0 @@ -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/files/make-4.0-char-cast.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.0-char-cast.patch deleted file mode 100644 index 86505be5da..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.0-char-cast.patch +++ /dev/null @@ -1,46 +0,0 @@ -http://savannah.gnu.org/bugs/?40371 -http://git.savannah.gnu.org/cgit/make.git/commit/?id=9d58570c - -From 9d58570c77240fed53d1f88217877f8e778f4bb2 Mon Sep 17 00:00:00 2001 -From: Paul Smith -Date: Sat, 26 Oct 2013 04:10:17 +0000 -Subject: * makeint.h (STOP_SET): [SV 40371] Cast to unsigned char. - -* tests/scripts/misc/utf8: Test variable names with characters >127. -Fix suggested by Robert Bogomip ---- -diff --git a/makeint.h b/makeint.h -index 77f51e0..c591427 100644 ---- a/makeint.h -+++ b/makeint.h -@@ -415,7 +415,7 @@ extern int unixy_shell; - # define MAP_VMSCOMMA 0x0000 - #endif - --#define STOP_SET(_v,_m) ANY_SET (stopchar_map[(int)(_v)],(_m)) -+#define STOP_SET(_v,_m) ANY_SET (stopchar_map[(unsigned char)(_v)],(_m)) - - #if defined(HAVE_SYS_RESOURCE_H) && defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT) - # define SET_STACK_SIZE -diff --git a/tests/scripts/misc/utf8 b/tests/scripts/misc/utf8 -new file mode 100644 -index 0000000..2adcd07 ---- a/dev/null -+++ b/tests/scripts/misc/utf8 -@@ -0,0 +1,14 @@ -+# -*-perl-*- -+$description = "Test utf8 handling."; -+ -+$details = ""; -+ -+# Variable names containing UTF8 characters -+run_make_test(" -+\xe2\x96\xaa := hello -+\$(info \$(\xe2\x96\xaa)) -+all: -+", -+ '', "hello\n#MAKE#: Nothing to be done for 'all'."); -+ -+1; --- -cgit v0.9.0.2 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.1-fix_null_returns_from_ttyname.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.1-fix_null_returns_from_ttyname.patch deleted file mode 100644 index f6be5c9f06..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.1-fix_null_returns_from_ttyname.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 292da6f6867b75a5af7ddbb639a1feae022f438f Mon Sep 17 00:00:00 2001 -From: Paul Smith -Date: Mon, 20 Oct 2014 05:54:56 +0000 -Subject: * main.c (main): [SV 43434] Handle NULL returns from ttyname(). - ---- -diff --git a/main.c b/main.c -index b2d169c..0cdb8a8 100644 ---- a/main.c -+++ b/main.c -@@ -1429,13 +1429,18 @@ main (int argc, char **argv, char **envp) - #ifdef HAVE_ISATTY - if (isatty (fileno (stdout))) - if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMOUT"))) -- define_variable_cname ("MAKE_TERMOUT", TTYNAME (fileno (stdout)), -- o_default, 0)->export = v_export; -- -+ { -+ const char *tty = TTYNAME (fileno (stdout)); -+ define_variable_cname ("MAKE_TERMOUT", tty ? tty : DEFAULT_TTYNAME, -+ o_default, 0)->export = v_export; -+ } - if (isatty (fileno (stderr))) - if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMERR"))) -- define_variable_cname ("MAKE_TERMERR", TTYNAME (fileno (stderr)), -- o_default, 0)->export = v_export; -+ { -+ const char *tty = TTYNAME (fileno (stderr)); -+ define_variable_cname ("MAKE_TERMERR", tty ? tty : DEFAULT_TTYNAME, -+ o_default, 0)->export = v_export; -+ } - #endif - - /* Reset in case the switches changed our minds. */ -diff --git a/makeint.h b/makeint.h -index 6223936..2009f41 100644 ---- a/makeint.h -+++ b/makeint.h -@@ -436,10 +436,11 @@ extern struct rlimit stack_limit; - /* The number of bytes needed to represent the largest integer as a string. */ - #define INTSTR_LENGTH CSTRLEN ("18446744073709551616") - -+#define DEFAULT_TTYNAME "true" - #ifdef HAVE_TTYNAME - # define TTYNAME(_f) ttyname (_f) - #else --# define TTYNAME(_f) "true" -+# define TTYNAME(_f) DEFAULT_TTYNAME - #endif - - --- -cgit v0.9.0.2 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2-default-cxx.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2-default-cxx.patch new file mode 100644 index 0000000000..4d592086a6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2-default-cxx.patch @@ -0,0 +1,13 @@ +diff --git a/default.c b/default.c +index 3d865c7..e8b3ed6 100644 +--- a/default.c ++++ b/default.c +@@ -530,7 +530,7 @@ static const char *default_variables[] = + "OBJC", "gcc", + #else + "CC", "cc", +- "CXX", "g++", ++ "CXX", "c++", + "OBJC", "cc", + #endif + diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2.1-glob-internals.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2.1-glob-internals.patch new file mode 100644 index 0000000000..9f70ae2084 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2.1-glob-internals.patch @@ -0,0 +1,67 @@ +From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Sun, 24 Sep 2017 09:12:58 -0400 +Subject: [PATCH] glob: Do not assume glibc glob internals. + +It has been proposed that glibc glob start using gl_lstat, +which the API allows it to do. GNU 'make' should not get in +the way of this. See: +https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html + +* dir.c (local_lstat): New function, like local_stat. +(dir_setup_glob): Use it to initialize gl_lstat too, as the API +requires. +--- + dir.c | 29 +++++++++++++++++++++++++++-- + 1 file changed, 27 insertions(+), 2 deletions(-) + +diff --git a/dir.c b/dir.c +index adbb8a9..c343e4c 100644 +--- a/dir.c ++++ b/dir.c +@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) + } + #endif + ++/* Similarly for lstat. */ ++#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) ++# ifndef VMS ++# ifndef HAVE_SYS_STAT_H ++int lstat (const char *path, struct stat *sbuf); ++# endif ++# else ++ /* We are done with the fake lstat. Go back to the real lstat */ ++# ifdef lstat ++# undef lstat ++# endif ++# endif ++# define local_lstat lstat ++#elif defined(WINDOWS32) ++/* Windows doesn't support lstat(). */ ++# define local_lstat local_stat ++#else ++static int ++local_lstat (const char *path, struct stat *buf) ++{ ++ int e; ++ EINTRLOOP (e, lstat (path, buf)); ++ return e; ++} ++#endif ++ + void + dir_setup_glob (glob_t *gl) + { + gl->gl_opendir = open_dirstream; + gl->gl_readdir = read_dirstream; + gl->gl_closedir = free; ++ gl->gl_lstat = local_lstat; + gl->gl_stat = local_stat; +- /* We don't bother setting gl_lstat, since glob never calls it. +- The slot is only there for compatibility with 4.4 BSD. */ + } + + void +-- +2.16.1 + diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2.1-glob-v2.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2.1-glob-v2.patch new file mode 100644 index 0000000000..e55a7790a3 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2.1-glob-v2.patch @@ -0,0 +1,30 @@ +http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116a914a325a0497721f5d8b58d5bba34d4 + +--- make-4.2.1/configure 2016-06-11 01:03:21.000000000 +0200 ++++ make-4.2.1/configure 2016-06-11 01:03:21.000000000 +0200 +@@ -11481,10 +11481,9 @@ + #include + #include + +-#define GLOB_INTERFACE_VERSION 1 + #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 + # include +-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION ++# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 + gnu glob + # endif + #endif +--- make-4.2.1/configure.ac 2016-06-06 14:27:31.000000000 +0200 ++++ make-4.2.1/configure.ac 2016-06-06 14:27:31.000000000 +0200 +@@ -399,10 +399,9 @@ + #include + #include + +-#define GLOB_INTERFACE_VERSION 1 + #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 + # include +-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION ++# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 + gnu glob + # endif + #endif], diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2.1-guile-2.2.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2.1-guile-2.2.patch new file mode 100644 index 0000000000..b7f9eb50b7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2.1-guile-2.2.patch @@ -0,0 +1,320 @@ +https://git.savannah.gnu.org/cgit/make.git/commit/?id=fbf71ec25a5986d9003ac16ee9e23675feac9053 +https://bugs.gentoo.org/650608 + +--- make-4.2.1/configure 2016-06-11 01:03:21.000000000 +0200 ++++ make-4.2.1/configure 2016-06-11 01:03:21.000000000 +0200 +@@ -9694,6 +9694,15 @@ + + # See if the user wants to add (or not) GNU Guile support + ++# Check whether --with-guile was given. ++if test "${with_guile+set}" = set; then : ++ withval=$with_guile; ++fi ++ ++ ++# Annoyingly, each version of Guile comes with it's own PC file so we have to ++# specify them as individual packages. Ugh. ++ + + + +@@ -9814,75 +9823,25 @@ + fi + fi + +-# Check whether --with-guile was given. +-if test "${with_guile+set}" = set; then : +- withval=$with_guile; +-fi +- +- +-# For some strange reason, at least on Ubuntu, each version of Guile +-# comes with it's own PC file so we have to specify them as individual +-# packages. Ugh. + if test "x$with_guile" != xno; then : +- +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUILE" >&5 +-$as_echo_n "checking for GUILE... " >&6; } +- +-if test -n "$GUILE_CFLAGS"; then +- pkg_cv_GUILE_CFLAGS="$GUILE_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "guile-2.0") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-2.0" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +-if test -n "$GUILE_LIBS"; then +- pkg_cv_GUILE_LIBS="$GUILE_LIBS" +- elif test -n "$PKG_CONFIG"; then ++ guile_versions="2.2 2.0 1.8" ++ guile_version=no ++ have_guile=no ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU Guile" >&5 ++$as_echo_n "checking for GNU Guile... " >&6; } ++ for v in $guile_versions; do + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "guile-2.0") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-\$v\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "guile-$v") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-2.0" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes ++ guile_version=$v; have_guile=yes; break + fi +- else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-2.0" 2>&1` +- else +- GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-2.0" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$GUILE_PKG_ERRORS" >&5 +- ++ done ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $guile_version" >&5 ++$as_echo "$guile_version" >&6; } ++ if test "$have_guile" = yes; then + + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUILE" >&5 +@@ -9892,12 +9851,12 @@ + pkg_cv_GUILE_CFLAGS="$GUILE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-1.8\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "guile-1.8") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-\$guile_version\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "guile-$guile_version") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-1.8" 2>/dev/null` ++ pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-$guile_version" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -9909,12 +9868,12 @@ + pkg_cv_GUILE_LIBS="$GUILE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-1.8\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "guile-1.8") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-\$guile_version\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "guile-$guile_version") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-1.8" 2>/dev/null` ++ pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-$guile_version" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes + else + pkg_failed=yes +@@ -9935,113 +9894,50 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-1.8" 2>&1` ++ GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-$guile_version" 2>&1` + else +- GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-1.8" 2>&1` ++ GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-$guile_version" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GUILE_PKG_ERRORS" >&5 + +- have_guile=no +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- have_guile=no +-else +- GUILE_CFLAGS=$pkg_cv_GUILE_CFLAGS +- GUILE_LIBS=$pkg_cv_GUILE_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- have_guile=yes +-fi +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } ++ as_fn_error $? "Package requirements (guile-$guile_version) were not met: + +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUILE" >&5 +-$as_echo_n "checking for GUILE... " >&6; } ++$GUILE_PKG_ERRORS + +-if test -n "$GUILE_CFLAGS"; then +- pkg_cv_GUILE_CFLAGS="$GUILE_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-1.8\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "guile-1.8") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-1.8" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +-if test -n "$GUILE_LIBS"; then +- pkg_cv_GUILE_LIBS="$GUILE_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-1.8\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "guile-1.8") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-1.8" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-1.8" 2>&1` +- else +- GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-1.8" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$GUILE_PKG_ERRORS" >&5 ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. + +- have_guile=no ++Alternatively, you may set the environment variables GUILE_CFLAGS ++and GUILE_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +- have_guile=no +-else +- GUILE_CFLAGS=$pkg_cv_GUILE_CFLAGS +- GUILE_LIBS=$pkg_cv_GUILE_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- have_guile=yes +-fi ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables GUILE_CFLAGS ++and GUILE_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see . ++See \`config.log' for more details" "$LINENO" 5; } + else + GUILE_CFLAGS=$pkg_cv_GUILE_CFLAGS + GUILE_LIBS=$pkg_cv_GUILE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- have_guile=yes +-fi + + fi + +-if test "$have_guile" = yes; then : +- + $as_echo "#define HAVE_GUILE 1" >>confdefs.h + ++ fi ++ + fi + + if test "$have_guile" = yes; then +--- make-4.2.1/configure.ac 2016-06-06 14:27:31.000000000 +0200 ++++ make-4.2.1/configure.ac 2016-06-06 14:27:31.000000000 +0200 +@@ -160,22 +160,28 @@ + AC_FUNC_CLOSEDIR_VOID + + # See if the user wants to add (or not) GNU Guile support +-PKG_PROG_PKG_CONFIG + AC_ARG_WITH([guile], [AS_HELP_STRING([--with-guile], + [Support GNU Guile for embedded scripting])]) + +-# For some strange reason, at least on Ubuntu, each version of Guile +-# comes with it's own PC file so we have to specify them as individual +-# packages. Ugh. ++# Annoyingly, each version of Guile comes with it's own PC file so we have to ++# specify them as individual packages. Ugh. ++PKG_PROG_PKG_CONFIG ++ + AS_IF([test "x$with_guile" != xno], +-[ PKG_CHECK_MODULES([GUILE], [guile-2.0], [have_guile=yes], +- [PKG_CHECK_MODULES([GUILE], [guile-1.8], [have_guile=yes], +- [have_guile=no])]) ++[ guile_versions="2.2 2.0 1.8" ++ guile_version=no ++ have_guile=no ++ AC_MSG_CHECKING([for GNU Guile]) ++ for v in $guile_versions; do ++ PKG_CHECK_EXISTS([guile-$v], [guile_version=$v; have_guile=yes; break], []) ++ done ++ AC_MSG_RESULT([$guile_version]) ++ if test "$have_guile" = yes; then ++ PKG_CHECK_MODULES(GUILE, [guile-$guile_version]) ++ AC_DEFINE([HAVE_GUILE], [1], [Embed GNU Guile support]) ++ fi + ]) + +-AS_IF([test "$have_guile" = yes], +- [AC_DEFINE([HAVE_GUILE], [1], [Embed GNU Guile support])]) +- + AM_CONDITIONAL([HAVE_GUILE], [test "$have_guile" = yes]) + + AC_FUNC_GETLOADAVG diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2.1-perl526.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2.1-perl526.patch new file mode 100644 index 0000000000..a935d1314e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2.1-perl526.patch @@ -0,0 +1,26 @@ +From d9d4e06084a4c7da480bd49a3487aadf6ba77b54 Mon Sep 17 00:00:00 2001 +From: Enrique Olaizola +Date: Sat, 27 May 2017 14:24:33 -0400 +Subject: [PATCH] * tests/run_make_tests.pl: [SV 50902] Find Perl modules + +--- + tests/run_make_tests.pl | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/tests/run_make_tests.pl b/tests/run_make_tests.pl +index a74417a..a844094 100644 +--- a/tests/run_make_tests.pl ++++ b/tests/run_make_tests.pl +@@ -64,6 +64,9 @@ if ($^O eq 'VMS') + $CMD_rmfile = 'delete_file -no_ask'; + } + ++use FindBin; ++use lib "$FindBin::Bin"; ++ + require "test_driver.pl"; + require "config-flags.pm"; + +-- +2.16.1 + diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2.1-pselect-non-blocking.patch b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2.1-pselect-non-blocking.patch new file mode 100644 index 0000000000..61e19516f3 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/files/make-4.2.1-pselect-non-blocking.patch @@ -0,0 +1,172 @@ +https://bugs.gentoo.org/664632 + +From b552b05251980f693c729e251f93f5225b400714 Mon Sep 17 00:00:00 2001 +From: Paul Smith +Date: Sat, 3 Jun 2017 16:20:51 -0400 +Subject: [SV 51159] Use a non-blocking read with pselect to avoid hangs. + +* posixos.c (set_blocking): Set blocking on a file descriptor. +(jobserver_setup): Set non-blocking on the jobserver read side. +(jobserver_parse_auth): Ditto. +(jobserver_acquire_all): Set blocking to avoid a busy-wait loop. +(jobserver_acquire): If the non-blocking read() returns without +taking a token then try again. +--- + posixos.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++----------------- + 1 file changed, 71 insertions(+), 26 deletions(-) + +diff --git a/posixos.c b/posixos.c +index e642d7f..dbafa51 100644 +--- a/posixos.c ++++ b/posixos.c +@@ -62,6 +62,24 @@ make_job_rfd (void) + #endif + } + ++static void ++set_blocking (int fd, int blocking) ++{ ++ // If we're not using pselect() don't change the blocking ++#ifdef HAVE_PSELECT ++ int flags; ++ EINTRLOOP (flags, fcntl (fd, F_GETFL)); ++ if (flags >= 0) ++ { ++ int r; ++ flags = blocking ? (flags & ~O_NONBLOCK) : (flags | O_NONBLOCK); ++ EINTRLOOP (r, fcntl (fd, F_SETFL, flags)); ++ if (r < 0) ++ pfatal_with_name ("fcntl(O_NONBLOCK)"); ++ } ++#endif ++} ++ + unsigned int + jobserver_setup (int slots) + { +@@ -86,6 +104,9 @@ jobserver_setup (int slots) + pfatal_with_name (_("init jobserver pipe")); + } + ++ /* When using pselect() we want the read to be non-blocking. */ ++ set_blocking (job_fds[0], 0); ++ + return 1; + } + +@@ -121,6 +142,9 @@ jobserver_parse_auth (const char *auth) + return 0; + } + ++ /* When using pselect() we want the read to be non-blocking. */ ++ set_blocking (job_fds[0], 0); ++ + return 1; + } + +@@ -169,7 +193,10 @@ jobserver_acquire_all (void) + { + unsigned int tokens = 0; + +- /* Close the write side, so the read() won't hang. */ ++ /* Use blocking reads to wait for all outstanding jobs. */ ++ set_blocking (job_fds[0], 1); ++ ++ /* Close the write side, so the read() won't hang forever. */ + close (job_fds[1]); + job_fds[1] = -1; + +@@ -236,18 +263,12 @@ jobserver_pre_acquire (void) + unsigned int + jobserver_acquire (int timeout) + { +- sigset_t empty; +- fd_set readfds; + struct timespec spec; + struct timespec *specp = NULL; +- int r; +- char intake; ++ sigset_t empty; + + sigemptyset (&empty); + +- FD_ZERO (&readfds); +- FD_SET (job_fds[0], &readfds); +- + if (timeout) + { + /* Alarm after one second (is this too granular?) */ +@@ -256,28 +277,52 @@ jobserver_acquire (int timeout) + specp = &spec; + } + +- r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty); +- +- if (r == -1) ++ while (1) + { +- /* Better be SIGCHLD. */ +- if (errno != EINTR) +- pfatal_with_name (_("pselect jobs pipe")); +- return 0; +- } ++ fd_set readfds; ++ int r; ++ char intake; + +- if (r == 0) +- /* Timeout. */ +- return 0; ++ FD_ZERO (&readfds); ++ FD_SET (job_fds[0], &readfds); + +- /* The read FD is ready: read it! */ +- EINTRLOOP (r, read (job_fds[0], &intake, 1)); +- if (r < 0) +- pfatal_with_name (_("read jobs pipe")); ++ r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty); ++ if (r < 0) ++ switch (errno) ++ { ++ case EINTR: ++ /* SIGCHLD will show up as an EINTR. */ ++ return 0; ++ ++ case EBADF: ++ /* Someone closed the jobs pipe. ++ That shouldn't happen but if it does we're done. */ ++ O (fatal, NILF, _("job server shut down")); + +- /* What does it mean if read() returns 0? It shouldn't happen because only +- the master make can reap all the tokens and close the write side...?? */ +- return r > 0; ++ default: ++ pfatal_with_name (_("pselect jobs pipe")); ++ } ++ ++ if (r == 0) ++ /* Timeout. */ ++ return 0; ++ ++ /* The read FD is ready: read it! This is non-blocking. */ ++ EINTRLOOP (r, read (job_fds[0], &intake, 1)); ++ ++ if (r < 0) ++ { ++ /* Someone sniped our token! Try again. */ ++ if (errno == EAGAIN) ++ continue; ++ ++ pfatal_with_name (_("read jobs pipe")); ++ } ++ ++ /* read() should never return 0: only the master make can reap all the ++ tokens and close the write side...?? */ ++ return r > 0; ++ } + } + + #else +-- +cgit v1.0-41-gc330 + 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 deleted file mode 100644 index 0f3c93f455..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.80-r4.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit eutils flag-o-matic - -DESCRIPTION="Standard tool to compile source trees" -HOMEPAGE="https://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 ~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-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.81-r2.ebuild deleted file mode 100644 index 555a67ca84..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.81-r2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit flag-o-matic eutils - -DESCRIPTION="Standard tool to compile source trees" -HOMEPAGE="https://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.82-r4.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.82-r4.ebuild deleted file mode 100644 index bb0b7c53ef..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/make-3.82-r4.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" - -inherit flag-o-matic eutils - -DESCRIPTION="Standard tool to compile source trees" -HOMEPAGE="https://www.gnu.org/software/make/make.html" -SRC_URI="mirror://gnu//make/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 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-4.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-4.0-r1.ebuild deleted file mode 100644 index 6e20912b65..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/make-4.0-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit flag-o-matic eutils - -DESCRIPTION="Standard tool to compile source trees" -HOMEPAGE="https://www.gnu.org/software/make/make.html" -SRC_URI="mirror://gnu//make/${P}.tar.bz2" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 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="guile nls static" - -CDEPEND="guile? ( >=dev-scheme/guile-1.8 )" -DEPEND="${CDEPEND} - nls? ( sys-devel/gettext )" -RDEPEND="${CDEPEND} - nls? ( virtual/libintl )" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch \ - "${FILESDIR}"/${P}-char-cast.patch -} - -src_configure() { - use static && append-ldflags -static - econf \ - --program-prefix=g \ - $(use_with guile) \ - $(use_enable nls) -} - -src_install() { - emake DESTDIR="${D}" install - 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-4.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-4.1-r1.ebuild deleted file mode 100644 index 939e6eed63..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/make/make-4.1-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit flag-o-matic eutils - -DESCRIPTION="Standard tool to compile source trees" -HOMEPAGE="https://www.gnu.org/software/make/make.html" -SRC_URI="mirror://gnu//make/${P}.tar.bz2" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 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="guile nls static" - -CDEPEND="guile? ( >=dev-scheme/guile-1.8 )" -DEPEND="${CDEPEND} - nls? ( sys-devel/gettext )" -RDEPEND="${CDEPEND} - nls? ( virtual/libintl )" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch \ - "${FILESDIR}"/${P}-fix_null_returns_from_ttyname.patch -} - -src_configure() { - use static && append-ldflags -static - econf \ - --program-prefix=g \ - $(use_with guile) \ - $(use_enable nls) -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS 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-4.2.1-r4.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-4.2.1-r4.ebuild new file mode 100644 index 0000000000..54f3b14943 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/make/make-4.2.1-r4.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit flag-o-matic + +DESCRIPTION="Standard tool to compile source trees" +HOMEPAGE="https://www.gnu.org/software/make/make.html" +SRC_URI="mirror://gnu//make/${P}.tar.bz2" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="guile nls static" + +CDEPEND="guile? ( >=dev-scheme/guile-1.8:= )" +DEPEND="${CDEPEND} + nls? ( sys-devel/gettext )" +RDEPEND="${CDEPEND} + nls? ( virtual/libintl )" + +PATCHES=( + "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch + "${FILESDIR}"/${PN}-4.2-default-cxx.patch + "${FILESDIR}"/${PN}-4.2.1-perl526.patch + "${FILESDIR}"/${PN}-4.2.1-glob-internals.patch + "${FILESDIR}"/${PN}-4.2.1-pselect-non-blocking.patch +) + +src_prepare() { + default + # These patches require special handling as they modify configure.ac + # which in turn triggers maintainer-mode when being applied the + # usual way. + eapply -Z "${FILESDIR}"/${PN}-4.2.1-glob-v2.patch \ + "${FILESDIR}"/${P}-guile-2.2.patch +} + +src_configure() { + use static && append-ldflags -static + local myeconfargs=( + --program-prefix=g + $(use_with guile) + $(use_enable nls) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + emake DESTDIR="${D}" install + dodoc AUTHORS 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 +}