[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 9d013f33f52d11c480ad0accd75a4793b36a53b3 Author: David Seifert gentoo org> AuthorDate: Mon May 22 16:26:10 2023 + Commit: David Seifert gentoo org> CommitDate: Mon May 22 16:26:10 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d013f33 sys-devel/make: remove ${USERLAND} Signed-off-by: David Seifert gentoo.org> sys-devel/make/{make-4.3.ebuild => make-4.3-r1.ebuild} | 9 +++-- sys-devel/make/{make-4.4.1.ebuild => make-4.4.1-r1.ebuild} | 9 +++-- sys-devel/make/make-.ebuild| 9 +++-- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3-r1.ebuild similarity index 89% rename from sys-devel/make/make-4.3.ebuild rename to sys-devel/make/make-4.3-r1.ebuild index c219f5ff1bee..892d5910d144 100644 --- a/sys-devel/make/make-4.3.ebuild +++ b/sys-devel/make/make-4.3-r1.ebuild @@ -67,10 +67,7 @@ src_configure() { 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 + + dosym gmake /usr/bin/make + dosym gmake.1 /usr/share/man/man1/make.1 } diff --git a/sys-devel/make/make-4.4.1.ebuild b/sys-devel/make/make-4.4.1-r1.ebuild similarity index 89% rename from sys-devel/make/make-4.4.1.ebuild rename to sys-devel/make/make-4.4.1-r1.ebuild index 8d425cc7108a..142bc1e77077 100644 --- a/sys-devel/make/make-4.4.1.ebuild +++ b/sys-devel/make/make-4.4.1-r1.ebuild @@ -70,10 +70,7 @@ src_configure() { 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 + + dosym gmake /usr/bin/make + dosym gmake.1 /usr/share/man/man1/make.1 } diff --git a/sys-devel/make/make-.ebuild b/sys-devel/make/make-.ebuild index de7a808ae4c1..a230283d6685 100644 --- a/sys-devel/make/make-.ebuild +++ b/sys-devel/make/make-.ebuild @@ -70,10 +70,7 @@ src_configure() { 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 + + dosym gmake /usr/bin/make + dosym gmake.1 /usr/share/man/man1/make.1 }
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 820ae9d634f265e029667db64a90dd82dd218567 Author: Sam James gentoo org> AuthorDate: Thu May 4 11:05:40 2023 + Commit: Sam James gentoo org> CommitDate: Thu May 4 11:21:00 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=820ae9d6 sys-devel/make: add savannah upstream metadata Signed-off-by: Sam James gentoo.org> sys-devel/make/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/sys-devel/make/metadata.xml b/sys-devel/make/metadata.xml index fee78a624e6a..068fc3567c55 100644 --- a/sys-devel/make/metadata.xml +++ b/sys-devel/make/metadata.xml @@ -7,5 +7,6 @@ cpe:/a:gnu:make + make
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: c1af13fd1dfecef11c7ed025ae21d054af9b320a Author: Sam James gentoo org> AuthorDate: Thu Apr 27 04:50:43 2023 + Commit: Sam James gentoo org> CommitDate: Thu Apr 27 04:50:57 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1af13fd sys-devel/make: Stabilize 4.4.1 ppc64, #905138 Signed-off-by: Sam James gentoo.org> sys-devel/make/make-4.4.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.4.1.ebuild b/sys-devel/make/make-4.4.1.ebuild index b333f02e6f5d..a8f7e56a6d5d 100644 --- a/sys-devel/make/make-4.4.1.ebuild +++ b/sys-devel/make/make-4.4.1.ebuild @@ -17,7 +17,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then else SRC_URI="mirror://gnu/make/${P}.tar.gz" SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 7c0ba524f0b664e85e58455e506be97f741976a7 Author: Sam James gentoo org> AuthorDate: Thu Apr 27 04:50:41 2023 + Commit: Sam James gentoo org> CommitDate: Thu Apr 27 04:50:56 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c0ba524 sys-devel/make: Stabilize 4.4.1 sparc, #905138 Signed-off-by: Sam James gentoo.org> sys-devel/make/make-4.4.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.4.1.ebuild b/sys-devel/make/make-4.4.1.ebuild index fb20251fb971..b333f02e6f5d 100644 --- a/sys-devel/make/make-4.4.1.ebuild +++ b/sys-devel/make/make-4.4.1.ebuild @@ -17,7 +17,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then else SRC_URI="mirror://gnu/make/${P}.tar.gz" SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 5b1e60ebac614edb71d97a7be3825bcd0d86e1ea Author: Sam James gentoo org> AuthorDate: Thu Apr 27 04:50:45 2023 + Commit: Sam James gentoo org> CommitDate: Thu Apr 27 04:50:59 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b1e60eb sys-devel/make: Stabilize 4.4.1 ppc, #905138 Signed-off-by: Sam James gentoo.org> sys-devel/make/make-4.4.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.4.1.ebuild b/sys-devel/make/make-4.4.1.ebuild index a8f7e56a6d5d..8d425cc7108a 100644 --- a/sys-devel/make/make-4.4.1.ebuild +++ b/sys-devel/make/make-4.4.1.ebuild @@ -17,7 +17,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then else SRC_URI="mirror://gnu/make/${P}.tar.gz" SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 615222d366d7e4c3442f8e5ea2d9f374e074c087 Author: Sam James gentoo org> AuthorDate: Thu Apr 27 04:50:31 2023 + Commit: Sam James gentoo org> CommitDate: Thu Apr 27 04:50:50 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=615222d3 sys-devel/make: Stabilize 4.4.1 arm, #905138 Signed-off-by: Sam James gentoo.org> sys-devel/make/make-4.4.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.4.1.ebuild b/sys-devel/make/make-4.4.1.ebuild index de7a808ae4c1..4216845dc4ab 100644 --- a/sys-devel/make/make-4.4.1.ebuild +++ b/sys-devel/make/make-4.4.1.ebuild @@ -17,7 +17,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then else SRC_URI="mirror://gnu/make/${P}.tar.gz" SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 65eb0c4cfd181dbc9a15f29e3f88c0cd2022bf91 Author: Sam James gentoo org> AuthorDate: Thu Apr 27 04:50:35 2023 + Commit: Sam James gentoo org> CommitDate: Thu Apr 27 04:50:53 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65eb0c4c sys-devel/make: Stabilize 4.4.1 x86, #905138 Signed-off-by: Sam James gentoo.org> sys-devel/make/make-4.4.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.4.1.ebuild b/sys-devel/make/make-4.4.1.ebuild index 39ae26310594..2bf6c0668e59 100644 --- a/sys-devel/make/make-4.4.1.ebuild +++ b/sys-devel/make/make-4.4.1.ebuild @@ -17,7 +17,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then else SRC_URI="mirror://gnu/make/${P}.tar.gz" SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )" - KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: fbf39214b7bd8f8608f26015caa0a1cf0cdb2f30 Author: Sam James gentoo org> AuthorDate: Thu Apr 27 04:50:37 2023 + Commit: Sam James gentoo org> CommitDate: Thu Apr 27 04:50:54 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbf39214 sys-devel/make: Stabilize 4.4.1 amd64, #905138 Signed-off-by: Sam James gentoo.org> sys-devel/make/make-4.4.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.4.1.ebuild b/sys-devel/make/make-4.4.1.ebuild index 2bf6c0668e59..972cf2a7cb83 100644 --- a/sys-devel/make/make-4.4.1.ebuild +++ b/sys-devel/make/make-4.4.1.ebuild @@ -17,7 +17,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then else SRC_URI="mirror://gnu/make/${P}.tar.gz" SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )" - KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 2483d909b94b8365c62b9cfad0cecd2fb988a1dd Author: Sam James gentoo org> AuthorDate: Thu Apr 27 04:50:34 2023 + Commit: Sam James gentoo org> CommitDate: Thu Apr 27 04:50:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2483d909 sys-devel/make: Stabilize 4.4.1 arm64, #905138 Signed-off-by: Sam James gentoo.org> sys-devel/make/make-4.4.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.4.1.ebuild b/sys-devel/make/make-4.4.1.ebuild index 4216845dc4ab..39ae26310594 100644 --- a/sys-devel/make/make-4.4.1.ebuild +++ b/sys-devel/make/make-4.4.1.ebuild @@ -17,7 +17,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then else SRC_URI="mirror://gnu/make/${P}.tar.gz" SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )" - KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 59b67be992fcca5cde4cc8217e72d30cd232a8ad Author: Sam James gentoo org> AuthorDate: Thu Apr 27 04:50:39 2023 + Commit: Sam James gentoo org> CommitDate: Thu Apr 27 04:50:55 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59b67be9 sys-devel/make: Stabilize 4.4.1 hppa, #905138 Signed-off-by: Sam James gentoo.org> sys-devel/make/make-4.4.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.4.1.ebuild b/sys-devel/make/make-4.4.1.ebuild index 972cf2a7cb83..fb20251fb971 100644 --- a/sys-devel/make/make-4.4.1.ebuild +++ b/sys-devel/make/make-4.4.1.ebuild @@ -17,7 +17,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then else SRC_URI="mirror://gnu/make/${P}.tar.gz" SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 4b1343b102d1aab5c0d6095a834db5de2c77f796 Author: Sam James gentoo org> AuthorDate: Fri Mar 24 01:15:31 2023 + Commit: Sam James gentoo org> CommitDate: Fri Mar 24 01:15:31 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b1343b1 sys-devel/make: sync live Signed-off-by: Sam James gentoo.org> sys-devel/make/make-.ebuild | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/sys-devel/make/make-.ebuild b/sys-devel/make/make-.ebuild index f161e636a1f8..de7a808ae4c1 100644 --- a/sys-devel/make/make-.ebuild +++ b/sys-devel/make/make-.ebuild @@ -25,14 +25,17 @@ SLOT="0" IUSE="guile nls static" DEPEND="guile? ( >=dev-scheme/guile-1.8:= )" -BDEPEND="nls? ( sys-devel/gettext ) - verify-sig? ( sec-keys/openpgp-keys-make )" -RDEPEND="${DEPEND} - nls? ( virtual/libintl )" +RDEPEND=" + ${DEPEND} + nls? ( virtual/libintl ) +" +BDEPEND=" + nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-make ) +" PATCHES=( - "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch - "${FILESDIR}"/${PN}-4.2-default-cxx.patch + "${FILESDIR}"/${PN}-4.4-default-cxx.patch ) src_unpack() {
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 8ae4e9b05943ea3375a72b35920a5c7e643167b4 Author: Sam James gentoo org> AuthorDate: Tue Feb 28 21:20:59 2023 + Commit: Sam James gentoo org> CommitDate: Tue Feb 28 21:21:10 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ae4e9b0 sys-devel/make: drop 4.4 Signed-off-by: Sam James gentoo.org> sys-devel/make/Manifest| 2 -- sys-devel/make/make-4.4.ebuild | 76 -- 2 files changed, 78 deletions(-) diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest index b95cc56260e2..ceee9e83b6c7 100644 --- a/sys-devel/make/Manifest +++ b/sys-devel/make/Manifest @@ -2,5 +2,3 @@ DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a6 DIST make-4.3.tar.gz.sig 566 BLAKE2B 75bf71602e60f97ec8efa81676329047746d960257ef310b89a059144c00628b6a1ddf7a16a2ac2c3e935b8591475f5043a7c7546668ab39abbc4717c75a6528 SHA512 bf13e2943593b153457c879e8ae11cef2d9185a986106a1e70946a260bd930505a5e10002c5a60888e11affc07713c367b8680fd511ad87b2e124d303a99 DIST make-4.4.1.tar.gz 2348200 BLAKE2B 09a4ad8060259e36854b525ab610fd317a86f4926e44e3ab8adba75dccc8d4b445df9dd25ccfb4c25a54bc0e98238a9127e36401d74cbc3503a329eadcdf4995 SHA512 145260cbd6a8226cef3dfef0c8baba31847beaebc7e6b65d39d02715fd4f4cab9b139b6c3772e550088d4f9ae80c6d3ed20b9a7664c693644dfb96b4cb60e67c DIST make-4.4.1.tar.gz.sig 833 BLAKE2B d5f9a33b0262d4a9216f47718f6596884852662a692e708191a7007964007940da1c06549db28ae1d13683c4a949b9ee86da9dedd9a80da8f8b09e71e659e9a1 SHA512 d7a5531c10f216d690ec036f3875c7f314fa53006e138568c60132d506db48d1a59201623e168091dafa4465b005991019e42f81ff1a96a44610b6b18de08b09 -DIST make-4.4.tar.gz 2307891 BLAKE2B 5b8a2fcd7610c33347c2e552fdc4f2698c9a4c468de588c9687cd11d15f120a37768bcd521231adf32359e3b48b27ab7b142746fd18b1a8d15578d34344f487e SHA512 4be73f494295dcfa10034531b0d920cfdb5438bc20625f863f5c878549c140e1e67195162580c53060c3c11c67a2c739c09051f02cdd283e5aa9ebcd68975a1f -DIST make-4.4.tar.gz.sig 566 BLAKE2B 879e85eccd748a9e6687e8beaaf1321ad84986990290c34d34285eab96fe9d493db1e6f20178aa5374796da9c8fb58f87065ea2de44a6daa55dd23dcc8b09c8f SHA512 76b7ecb3aa38b0a6867fd0379e42d2cae6632f102d902ac604e7ea3265ac1c1090da8e5676bd56b9946dc291e57c06bb05c953f76714fe8bd27b924bb39301e6 diff --git a/sys-devel/make/make-4.4.ebuild b/sys-devel/make/make-4.4.ebuild deleted file mode 100644 index 995022126a40.. --- a/sys-devel/make/make-4.4.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/make.asc -inherit flag-o-matic verify-sig - -DESCRIPTION="Standard tool to compile source trees" -HOMEPAGE="https://www.gnu.org/software/make/make.html; -if [[ ${PV} == ]] ; then - EGIT_REPO_URI="https://git.savannah.gnu.org/git/make.git; - inherit autotools git-r3 -elif [[ $(ver_cut 3) -ge 90 ]] ; then - SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.gz; - SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.gz.sig )" -else - SRC_URI="mirror://gnu/make/${P}.tar.gz" - SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="GPL-3+" -SLOT="0" -IUSE="guile nls static" - -DEPEND="guile? ( >=dev-scheme/guile-1.8:= )" -BDEPEND="nls? ( sys-devel/gettext ) - verify-sig? ( sec-keys/openpgp-keys-make )" -RDEPEND="${DEPEND} - nls? ( virtual/libintl )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch - "${FILESDIR}"/${PN}-4.2-default-cxx.patch -) - -src_unpack() { - if [[ ${PV} == ]] ; then - git-r3_src_unpack - - cd "${S}" || die - ./bootstrap || die - else - default - fi -} - -src_prepare() { - default - - if [[ ${PV} == ]] ; then - eautoreconf - fi -} - -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 -}
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: b9bae9640fbb08c0196a297e755e620c2fcd7a05 Author: Sam James gentoo org> AuthorDate: Sun Feb 26 20:18:02 2023 + Commit: Sam James gentoo org> CommitDate: Sun Feb 26 20:21:25 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9bae964 sys-devel/make: add 4.4.1, drop 4.4.0.91, drop 4.4.0.90 Drop the beta/pre-release versions. Bug: https://bugs.gentoo.org/879081 Signed-off-by: Sam James gentoo.org> sys-devel/make/Manifest| 6 +- sys-devel/make/make-4.4.0.90.ebuild| 76 -- .../{make-4.4.0.91.ebuild => make-4.4.1.ebuild}| 0 3 files changed, 2 insertions(+), 80 deletions(-) diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest index bf1e7143119a..b95cc56260e2 100644 --- a/sys-devel/make/Manifest +++ b/sys-devel/make/Manifest @@ -1,8 +1,6 @@ DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b DIST make-4.3.tar.gz.sig 566 BLAKE2B 75bf71602e60f97ec8efa81676329047746d960257ef310b89a059144c00628b6a1ddf7a16a2ac2c3e935b8591475f5043a7c7546668ab39abbc4717c75a6528 SHA512 bf13e2943593b153457c879e8ae11cef2d9185a986106a1e70946a260bd930505a5e10002c5a60888e11affc07713c367b8680fd511ad87b2e124d303a99 -DIST make-4.4.0.90.tar.gz 2328399 BLAKE2B fc260a3c942b00d57bc64fc037e4e4a51ec281194122e3315f0ca7c6fe3507877c84bff62e197f5df45e1d5d95aae347085e225377788ebd466a1327cb25 SHA512 e693e6146871dcaf5b65b6c05b620047b6c2a3474b02ecc58cf4698f88107cc7a7b0d35551eb209c772b09ea7db2ffde13fe984d6227339974ca54a68b99839b -DIST make-4.4.0.90.tar.gz.sig 833 BLAKE2B b0a2d98f5a99ee29523c6b25be4b29bfb193773ab5b70ce26adf75a066e30ca95d79b111eedc656e817246cfaf7f9345014626b12de5a381e44e4b6f8ddd5be1 SHA512 7a20c6058221b1003a26806f65d7b568575f88187562b89b7593c67dfc2b15569cd92c75c23056b2a3ff7577f96794835f1b6d5d9f5f5b92c59acb3af8efc944 -DIST make-4.4.0.91.tar.gz 2345140 BLAKE2B 3e28fa6e74684329f41aab69aa3558e45381b64964cacd4c83611df86d7ade69cec9561248c817b2e3f52db60c2821e34603d68e1957377c05c48e6b09a93295 SHA512 7798340062edf15c0ad459c3f9741125337c5bf59e002cc109b4e5d59e7cf9c510f4fcf33aba0bf61a0e91d6259f84d6cffabfe7a3eb45a07e70a5ba54e91d37 -DIST make-4.4.0.91.tar.gz.sig 833 BLAKE2B 7d86e8cfb5018ab32701379b7b04777c032d40d0fe02469ddb2113f3878079ee3e99a69636c5a2a42d0a20e43f833f88709d456255418ae4007fb18ebda4ab0d SHA512 950e11c5c27d198846d0c871f5e3d9b4bd3afa43aa9819cd293c3c97083b7df4c5b7cc5959b17c488433bba3e64a53ab51805bad5788b106d462fb97f7ea2fb2 +DIST make-4.4.1.tar.gz 2348200 BLAKE2B 09a4ad8060259e36854b525ab610fd317a86f4926e44e3ab8adba75dccc8d4b445df9dd25ccfb4c25a54bc0e98238a9127e36401d74cbc3503a329eadcdf4995 SHA512 145260cbd6a8226cef3dfef0c8baba31847beaebc7e6b65d39d02715fd4f4cab9b139b6c3772e550088d4f9ae80c6d3ed20b9a7664c693644dfb96b4cb60e67c +DIST make-4.4.1.tar.gz.sig 833 BLAKE2B d5f9a33b0262d4a9216f47718f6596884852662a692e708191a7007964007940da1c06549db28ae1d13683c4a949b9ee86da9dedd9a80da8f8b09e71e659e9a1 SHA512 d7a5531c10f216d690ec036f3875c7f314fa53006e138568c60132d506db48d1a59201623e168091dafa4465b005991019e42f81ff1a96a44610b6b18de08b09 DIST make-4.4.tar.gz 2307891 BLAKE2B 5b8a2fcd7610c33347c2e552fdc4f2698c9a4c468de588c9687cd11d15f120a37768bcd521231adf32359e3b48b27ab7b142746fd18b1a8d15578d34344f487e SHA512 4be73f494295dcfa10034531b0d920cfdb5438bc20625f863f5c878549c140e1e67195162580c53060c3c11c67a2c739c09051f02cdd283e5aa9ebcd68975a1f DIST make-4.4.tar.gz.sig 566 BLAKE2B 879e85eccd748a9e6687e8beaaf1321ad84986990290c34d34285eab96fe9d493db1e6f20178aa5374796da9c8fb58f87065ea2de44a6daa55dd23dcc8b09c8f SHA512 76b7ecb3aa38b0a6867fd0379e42d2cae6632f102d902ac604e7ea3265ac1c1090da8e5676bd56b9946dc291e57c06bb05c953f76714fe8bd27b924bb39301e6 diff --git a/sys-devel/make/make-4.4.0.90.ebuild b/sys-devel/make/make-4.4.0.90.ebuild deleted file mode 100644 index f161e636a1f8.. --- a/sys-devel/make/make-4.4.0.90.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/make.asc -inherit flag-o-matic verify-sig - -DESCRIPTION="Standard tool to compile source trees" -HOMEPAGE="https://www.gnu.org/software/make/make.html; -if [[ ${PV} == ]] ; then - EGIT_REPO_URI="https://git.savannah.gnu.org/git/make.git; - inherit autotools git-r3 -elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then - SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.gz; - SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.gz.sig )" -else - SRC_URI="mirror://gnu/make/${P}.tar.gz" - SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )" -
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: dc72227c9b2985c91d6f34885e066e4827b06f3e Author: Sam James gentoo org> AuthorDate: Fri Feb 24 18:34:48 2023 + Commit: Sam James gentoo org> CommitDate: Fri Feb 24 18:36:05 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc72227c sys-devel/make: keyword for ~arm64-macos Signed-off-by: Sam James gentoo.org> sys-devel/make/make-4.3.ebuild | 4 ++-- sys-devel/make/make-4.4.0.90.ebuild | 2 +- sys-devel/make/make-4.4.0.91.ebuild | 2 +- sys-devel/make/make-4.4.ebuild | 4 ++-- sys-devel/make/make-.ebuild | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild index e924bf762998..c219f5ff1bee 100644 --- a/sys-devel/make/make-4.3.ebuild +++ b/sys-devel/make/make-4.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,7 +17,7 @@ elif [[ $(ver_cut 3) -ge 90 ]] ; then else SRC_URI="mirror://gnu//make/${P}.tar.gz" SRC_URI+=" verify-sig? ( mirror://gnu//make/${P}.tar.gz.sig )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+" diff --git a/sys-devel/make/make-4.4.0.90.ebuild b/sys-devel/make/make-4.4.0.90.ebuild index abb820aa6eb6..f161e636a1f8 100644 --- a/sys-devel/make/make-4.4.0.90.ebuild +++ b/sys-devel/make/make-4.4.0.90.ebuild @@ -17,7 +17,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then else SRC_URI="mirror://gnu/make/${P}.tar.gz" SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+" diff --git a/sys-devel/make/make-4.4.0.91.ebuild b/sys-devel/make/make-4.4.0.91.ebuild index 27cc510be3c6..de7a808ae4c1 100644 --- a/sys-devel/make/make-4.4.0.91.ebuild +++ b/sys-devel/make/make-4.4.0.91.ebuild @@ -17,7 +17,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then else SRC_URI="mirror://gnu/make/${P}.tar.gz" SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+" diff --git a/sys-devel/make/make-4.4.ebuild b/sys-devel/make/make-4.4.ebuild index 73a2aedb6375..995022126a40 100644 --- a/sys-devel/make/make-4.4.ebuild +++ b/sys-devel/make/make-4.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ elif [[ $(ver_cut 3) -ge 90 ]] ; then else SRC_URI="mirror://gnu/make/${P}.tar.gz" SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+" diff --git a/sys-devel/make/make-.ebuild b/sys-devel/make/make-.ebuild index abb820aa6eb6..f161e636a1f8 100644 --- a/sys-devel/make/make-.ebuild +++ b/sys-devel/make/make-.ebuild @@ -17,7 +17,7 @@ elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then else SRC_URI="mirror://gnu/make/${P}.tar.gz" SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/files/, sys-devel/make/
commit: b236fbece3f4fad456f65583550ff693bc13619e Author: Sam James gentoo org> AuthorDate: Sun Feb 19 18:05:02 2023 + Commit: Sam James gentoo org> CommitDate: Sun Feb 19 18:05:12 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b236fbec sys-devel/make: add 4.4.0.91 Signed-off-by: Sam James gentoo.org> sys-devel/make/Manifest | 2 + sys-devel/make/files/make-4.4-default-cxx.patch | 11 sys-devel/make/make-4.4.0.91.ebuild | 79 + 3 files changed, 92 insertions(+) diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest index cb6f278d5cb1..bf1e7143119a 100644 --- a/sys-devel/make/Manifest +++ b/sys-devel/make/Manifest @@ -2,5 +2,7 @@ DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a6 DIST make-4.3.tar.gz.sig 566 BLAKE2B 75bf71602e60f97ec8efa81676329047746d960257ef310b89a059144c00628b6a1ddf7a16a2ac2c3e935b8591475f5043a7c7546668ab39abbc4717c75a6528 SHA512 bf13e2943593b153457c879e8ae11cef2d9185a986106a1e70946a260bd930505a5e10002c5a60888e11affc07713c367b8680fd511ad87b2e124d303a99 DIST make-4.4.0.90.tar.gz 2328399 BLAKE2B fc260a3c942b00d57bc64fc037e4e4a51ec281194122e3315f0ca7c6fe3507877c84bff62e197f5df45e1d5d95aae347085e225377788ebd466a1327cb25 SHA512 e693e6146871dcaf5b65b6c05b620047b6c2a3474b02ecc58cf4698f88107cc7a7b0d35551eb209c772b09ea7db2ffde13fe984d6227339974ca54a68b99839b DIST make-4.4.0.90.tar.gz.sig 833 BLAKE2B b0a2d98f5a99ee29523c6b25be4b29bfb193773ab5b70ce26adf75a066e30ca95d79b111eedc656e817246cfaf7f9345014626b12de5a381e44e4b6f8ddd5be1 SHA512 7a20c6058221b1003a26806f65d7b568575f88187562b89b7593c67dfc2b15569cd92c75c23056b2a3ff7577f96794835f1b6d5d9f5f5b92c59acb3af8efc944 +DIST make-4.4.0.91.tar.gz 2345140 BLAKE2B 3e28fa6e74684329f41aab69aa3558e45381b64964cacd4c83611df86d7ade69cec9561248c817b2e3f52db60c2821e34603d68e1957377c05c48e6b09a93295 SHA512 7798340062edf15c0ad459c3f9741125337c5bf59e002cc109b4e5d59e7cf9c510f4fcf33aba0bf61a0e91d6259f84d6cffabfe7a3eb45a07e70a5ba54e91d37 +DIST make-4.4.0.91.tar.gz.sig 833 BLAKE2B 7d86e8cfb5018ab32701379b7b04777c032d40d0fe02469ddb2113f3878079ee3e99a69636c5a2a42d0a20e43f833f88709d456255418ae4007fb18ebda4ab0d SHA512 950e11c5c27d198846d0c871f5e3d9b4bd3afa43aa9819cd293c3c97083b7df4c5b7cc5959b17c488433bba3e64a53ab51805bad5788b106d462fb97f7ea2fb2 DIST make-4.4.tar.gz 2307891 BLAKE2B 5b8a2fcd7610c33347c2e552fdc4f2698c9a4c468de588c9687cd11d15f120a37768bcd521231adf32359e3b48b27ab7b142746fd18b1a8d15578d34344f487e SHA512 4be73f494295dcfa10034531b0d920cfdb5438bc20625f863f5c878549c140e1e67195162580c53060c3c11c67a2c739c09051f02cdd283e5aa9ebcd68975a1f DIST make-4.4.tar.gz.sig 566 BLAKE2B 879e85eccd748a9e6687e8beaaf1321ad84986990290c34d34285eab96fe9d493db1e6f20178aa5374796da9c8fb58f87065ea2de44a6daa55dd23dcc8b09c8f SHA512 76b7ecb3aa38b0a6867fd0379e42d2cae6632f102d902ac604e7ea3265ac1c1090da8e5676bd56b9946dc291e57c06bb05c953f76714fe8bd27b924bb39301e6 diff --git a/sys-devel/make/files/make-4.4-default-cxx.patch b/sys-devel/make/files/make-4.4-default-cxx.patch new file mode 100644 index ..4a56df5da2c8 --- /dev/null +++ b/sys-devel/make/files/make-4.4-default-cxx.patch @@ -0,0 +1,11 @@ +--- a/src/default.c b/src/default.c +@@ -542,7 +542,7 @@ static const char *default_variables[] = + "CXX", "gcc", + # endif /* __MSDOS__ */ + # else +-"CXX", "g++", ++"CXX", "c++", + # endif + #endif + /* This expands to $(CO) $(COFLAGS) $< $@ if $@ does not exist, diff --git a/sys-devel/make/make-4.4.0.91.ebuild b/sys-devel/make/make-4.4.0.91.ebuild new file mode 100644 index ..27cc510be3c6 --- /dev/null +++ b/sys-devel/make/make-4.4.0.91.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/make.asc +inherit flag-o-matic verify-sig + +DESCRIPTION="Standard tool to compile source trees" +HOMEPAGE="https://www.gnu.org/software/make/make.html; +if [[ ${PV} == ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/make.git; + inherit autotools git-r3 +elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then + SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.gz; + SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.gz.sig )" +else + SRC_URI="mirror://gnu/make/${P}.tar.gz" + SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="GPL-3+" +SLOT="0" +IUSE="guile nls static" + +DEPEND="guile? ( >=dev-scheme/guile-1.8:= )" +RDEPEND=" + ${DEPEND} + nls? ( virtual/libintl ) +" +BDEPEND=" + nls? (
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 80475b996f17fb1e0cf934fe510e606447868120 Author: Sam James gentoo org> AuthorDate: Sat Jan 14 22:14:05 2023 + Commit: Sam James gentoo org> CommitDate: Sat Jan 14 22:14:05 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80475b99 sys-devel/make: add 4.4.0.90 (RC, unkeyworded) Signed-off-by: Sam James gentoo.org> sys-devel/make/Manifest | 2 ++ sys-devel/make/{make-.ebuild => make-4.4.0.90.ebuild} | 4 ++-- sys-devel/make/make-.ebuild | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest index ef67fd9db61c..cb6f278d5cb1 100644 --- a/sys-devel/make/Manifest +++ b/sys-devel/make/Manifest @@ -1,4 +1,6 @@ DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b DIST make-4.3.tar.gz.sig 566 BLAKE2B 75bf71602e60f97ec8efa81676329047746d960257ef310b89a059144c00628b6a1ddf7a16a2ac2c3e935b8591475f5043a7c7546668ab39abbc4717c75a6528 SHA512 bf13e2943593b153457c879e8ae11cef2d9185a986106a1e70946a260bd930505a5e10002c5a60888e11affc07713c367b8680fd511ad87b2e124d303a99 +DIST make-4.4.0.90.tar.gz 2328399 BLAKE2B fc260a3c942b00d57bc64fc037e4e4a51ec281194122e3315f0ca7c6fe3507877c84bff62e197f5df45e1d5d95aae347085e225377788ebd466a1327cb25 SHA512 e693e6146871dcaf5b65b6c05b620047b6c2a3474b02ecc58cf4698f88107cc7a7b0d35551eb209c772b09ea7db2ffde13fe984d6227339974ca54a68b99839b +DIST make-4.4.0.90.tar.gz.sig 833 BLAKE2B b0a2d98f5a99ee29523c6b25be4b29bfb193773ab5b70ce26adf75a066e30ca95d79b111eedc656e817246cfaf7f9345014626b12de5a381e44e4b6f8ddd5be1 SHA512 7a20c6058221b1003a26806f65d7b568575f88187562b89b7593c67dfc2b15569cd92c75c23056b2a3ff7577f96794835f1b6d5d9f5f5b92c59acb3af8efc944 DIST make-4.4.tar.gz 2307891 BLAKE2B 5b8a2fcd7610c33347c2e552fdc4f2698c9a4c468de588c9687cd11d15f120a37768bcd521231adf32359e3b48b27ab7b142746fd18b1a8d15578d34344f487e SHA512 4be73f494295dcfa10034531b0d920cfdb5438bc20625f863f5c878549c140e1e67195162580c53060c3c11c67a2c739c09051f02cdd283e5aa9ebcd68975a1f DIST make-4.4.tar.gz.sig 566 BLAKE2B 879e85eccd748a9e6687e8beaaf1321ad84986990290c34d34285eab96fe9d493db1e6f20178aa5374796da9c8fb58f87065ea2de44a6daa55dd23dcc8b09c8f SHA512 76b7ecb3aa38b0a6867fd0379e42d2cae6632f102d902ac604e7ea3265ac1c1090da8e5676bd56b9946dc291e57c06bb05c953f76714fe8bd27b924bb39301e6 diff --git a/sys-devel/make/make-.ebuild b/sys-devel/make/make-4.4.0.90.ebuild similarity index 95% copy from sys-devel/make/make-.ebuild copy to sys-devel/make/make-4.4.0.90.ebuild index 73a2aedb6375..abb820aa6eb6 100644 --- a/sys-devel/make/make-.ebuild +++ b/sys-devel/make/make-4.4.0.90.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnu.org/software/make/make.html; if [[ ${PV} == ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/git/make.git; inherit autotools git-r3 -elif [[ $(ver_cut 3) -ge 90 ]] ; then +elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.gz; SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.gz.sig )" else diff --git a/sys-devel/make/make-.ebuild b/sys-devel/make/make-.ebuild index 73a2aedb6375..abb820aa6eb6 100644 --- a/sys-devel/make/make-.ebuild +++ b/sys-devel/make/make-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnu.org/software/make/make.html; if [[ ${PV} == ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/git/make.git; inherit autotools git-r3 -elif [[ $(ver_cut 3) -ge 90 ]] ; then +elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.gz; SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.gz.sig )" else
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 082d337c4d4525a9d482c092935d4f871471f1ab Author: Sam James gentoo org> AuthorDate: Mon Oct 31 15:45:08 2022 + Commit: Sam James gentoo org> CommitDate: Mon Oct 31 15:45:08 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=082d337c sys-devel/make: add 4.4 Signed-off-by: Sam James gentoo.org> sys-devel/make/Manifest| 4 ++-- sys-devel/make/{make-4.3.92.ebuild => make-4.4.ebuild} | 0 sys-devel/make/make-.ebuild| 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest index bb9c46e7f5fa..ef67fd9db61c 100644 --- a/sys-devel/make/Manifest +++ b/sys-devel/make/Manifest @@ -1,4 +1,4 @@ -DIST make-4.3.92.tar.gz 2296745 BLAKE2B 6b13a7982297180b9cd737fc9dde42498da5f0277227f4a2cdea9770b59eb37ae95d02e6debbd6e07dc722509d23f0f233d760fdeb2bcd6e5e3c3f28114c597f SHA512 c92efb99c3c406eac211635012af22c44575d9290ab20185fee1c3f208313cef920e86ca15fcb21b4f99e638e55a59c357ade2bd5595cfe0ff85aa64413a6d90 -DIST make-4.3.92.tar.gz.sig 566 BLAKE2B a434d7290ebf03f2ce70f59990961a245dcb1461b1fd1b3efdeaeaf6311ab902a4f98c22b12425fe1948ba3ab4f6c6e47dca6ed29ced7694a10af991a51599e2 SHA512 164b95b778b212951d31c05171def036cb65bd43788ac1deea283856771505a072add34d0fffc3cc7211a3242afe07cd29f168b4614556094c1bf505b860f54d DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b DIST make-4.3.tar.gz.sig 566 BLAKE2B 75bf71602e60f97ec8efa81676329047746d960257ef310b89a059144c00628b6a1ddf7a16a2ac2c3e935b8591475f5043a7c7546668ab39abbc4717c75a6528 SHA512 bf13e2943593b153457c879e8ae11cef2d9185a986106a1e70946a260bd930505a5e10002c5a60888e11affc07713c367b8680fd511ad87b2e124d303a99 +DIST make-4.4.tar.gz 2307891 BLAKE2B 5b8a2fcd7610c33347c2e552fdc4f2698c9a4c468de588c9687cd11d15f120a37768bcd521231adf32359e3b48b27ab7b142746fd18b1a8d15578d34344f487e SHA512 4be73f494295dcfa10034531b0d920cfdb5438bc20625f863f5c878549c140e1e67195162580c53060c3c11c67a2c739c09051f02cdd283e5aa9ebcd68975a1f +DIST make-4.4.tar.gz.sig 566 BLAKE2B 879e85eccd748a9e6687e8beaaf1321ad84986990290c34d34285eab96fe9d493db1e6f20178aa5374796da9c8fb58f87065ea2de44a6daa55dd23dcc8b09c8f SHA512 76b7ecb3aa38b0a6867fd0379e42d2cae6632f102d902ac604e7ea3265ac1c1090da8e5676bd56b9946dc291e57c06bb05c953f76714fe8bd27b924bb39301e6 diff --git a/sys-devel/make/make-4.3.92.ebuild b/sys-devel/make/make-4.4.ebuild similarity index 100% rename from sys-devel/make/make-4.3.92.ebuild rename to sys-devel/make/make-4.4.ebuild diff --git a/sys-devel/make/make-.ebuild b/sys-devel/make/make-.ebuild index c0a4aa6ff54a..73a2aedb6375 100644 --- a/sys-devel/make/make-.ebuild +++ b/sys-devel/make/make-.ebuild @@ -15,8 +15,8 @@ elif [[ $(ver_cut 3) -ge 90 ]] ; then SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.gz; SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.gz.sig )" else - SRC_URI="mirror://gnu//make/${P}.tar.gz" - SRC_URI+=" verify-sig? ( mirror://gnu//make/${P}.tar.gz.sig )" + SRC_URI="mirror://gnu/make/${P}.tar.gz" + SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: a15b046fc35ec5e2397e3b7fa95283233d58782a Author: Sam James gentoo org> AuthorDate: Mon Oct 24 11:46:32 2022 + Commit: Sam James gentoo org> CommitDate: Mon Oct 24 11:46:32 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a15b046f sys-devel/make: add 4.3.92, drop 4.3.91 ("pretest", unkeyworded) Signed-off-by: Sam James gentoo.org> sys-devel/make/Manifest | 4 ++-- sys-devel/make/{make-4.3.91.ebuild => make-4.3.92.ebuild} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest index 7d6f58208194..bb9c46e7f5fa 100644 --- a/sys-devel/make/Manifest +++ b/sys-devel/make/Manifest @@ -1,4 +1,4 @@ -DIST make-4.3.91.tar.gz 2280069 BLAKE2B de3e850d6f60a208f2870aee9f7b88a49b4fb9c29d932abb00c1a7613a7be151ab871cca4a556dfe66eaefd408c8007da712f36b5f3a9b80479f024c983f47f4 SHA512 3b16641e6b8bb8d1324572ae3e42860a35cd1b3ee2fd32b96340737acc42d43a4959b92e40ea2a591b387430a7e9b1391da78ff6301d1db358380c578312a61a -DIST make-4.3.91.tar.gz.sig 566 BLAKE2B 7d010114186c06b91324e200f7a1036d2b8a49c219d194b5c03067b77549aab282625442c37ac74a25b0c15d16972742a4976028f50f85352716615ccac0cf1f SHA512 a6edb9cb4daceb2938bdf0afce2967b97fc8565dcdee208b522ab46f237b5fa73d1b627c9dd676fbddc384b45ce55ba3a5eb9d4139eb4ed8a6016762bbcea6da +DIST make-4.3.92.tar.gz 2296745 BLAKE2B 6b13a7982297180b9cd737fc9dde42498da5f0277227f4a2cdea9770b59eb37ae95d02e6debbd6e07dc722509d23f0f233d760fdeb2bcd6e5e3c3f28114c597f SHA512 c92efb99c3c406eac211635012af22c44575d9290ab20185fee1c3f208313cef920e86ca15fcb21b4f99e638e55a59c357ade2bd5595cfe0ff85aa64413a6d90 +DIST make-4.3.92.tar.gz.sig 566 BLAKE2B a434d7290ebf03f2ce70f59990961a245dcb1461b1fd1b3efdeaeaf6311ab902a4f98c22b12425fe1948ba3ab4f6c6e47dca6ed29ced7694a10af991a51599e2 SHA512 164b95b778b212951d31c05171def036cb65bd43788ac1deea283856771505a072add34d0fffc3cc7211a3242afe07cd29f168b4614556094c1bf505b860f54d DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b DIST make-4.3.tar.gz.sig 566 BLAKE2B 75bf71602e60f97ec8efa81676329047746d960257ef310b89a059144c00628b6a1ddf7a16a2ac2c3e935b8591475f5043a7c7546668ab39abbc4717c75a6528 SHA512 bf13e2943593b153457c879e8ae11cef2d9185a986106a1e70946a260bd930505a5e10002c5a60888e11affc07713c367b8680fd511ad87b2e124d303a99 diff --git a/sys-devel/make/make-4.3.91.ebuild b/sys-devel/make/make-4.3.92.ebuild similarity index 100% rename from sys-devel/make/make-4.3.91.ebuild rename to sys-devel/make/make-4.3.92.ebuild
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: a001c803f37aa0441ca208601b181bde9948e9ca Author: Sam James gentoo org> AuthorDate: Thu Oct 20 03:36:43 2022 + Commit: Sam James gentoo org> CommitDate: Thu Oct 20 03:43:03 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a001c803 sys-devel/make: add 4.3.91, drop 4.3.90 ("pretest", unkeyworded) Signed-off-by: Sam James gentoo.org> sys-devel/make/Manifest | 4 ++-- sys-devel/make/{make-4.3.90.ebuild => make-4.3.91.ebuild} | 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest index bb77625f205d..7d6f58208194 100644 --- a/sys-devel/make/Manifest +++ b/sys-devel/make/Manifest @@ -1,4 +1,4 @@ -DIST make-4.3.90.tar.gz 2235311 BLAKE2B 42717d885ae190b8abef2ec2431c061f4575c5818eff745fe445034813ce48f91134c2a54dce129d51ac45b7086a3ee65cb47d86ab98d2faf186947be3ec3455 SHA512 52151b4eeecfb5a94d4010eeb46b72a66eb3783a6ff1ab46fd6a1d1e9aeef14d62429414a3c5dec0d1f20cfad2ec82bf9c179dcfe5851f4353d7a2ff0498cb26 -DIST make-4.3.90.tar.gz.sig 566 BLAKE2B e72199bde5c4ba25f3f5a520c24d3c3f096c8295fd45184f6bbe35005fefe65c3e761db034224bcaffe255e4634739e87765b12ab0122bfe400f37e41fc25216 SHA512 60474c73e188591cecd4c63a108b72831a49d345f5dbc78271b80cd443c6271b0fabd95709e8c837eea2ad98f73119333d798fb6ac8a00e3d8d320d936bc5c6f +DIST make-4.3.91.tar.gz 2280069 BLAKE2B de3e850d6f60a208f2870aee9f7b88a49b4fb9c29d932abb00c1a7613a7be151ab871cca4a556dfe66eaefd408c8007da712f36b5f3a9b80479f024c983f47f4 SHA512 3b16641e6b8bb8d1324572ae3e42860a35cd1b3ee2fd32b96340737acc42d43a4959b92e40ea2a591b387430a7e9b1391da78ff6301d1db358380c578312a61a +DIST make-4.3.91.tar.gz.sig 566 BLAKE2B 7d010114186c06b91324e200f7a1036d2b8a49c219d194b5c03067b77549aab282625442c37ac74a25b0c15d16972742a4976028f50f85352716615ccac0cf1f SHA512 a6edb9cb4daceb2938bdf0afce2967b97fc8565dcdee208b522ab46f237b5fa73d1b627c9dd676fbddc384b45ce55ba3a5eb9d4139eb4ed8a6016762bbcea6da DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b DIST make-4.3.tar.gz.sig 566 BLAKE2B 75bf71602e60f97ec8efa81676329047746d960257ef310b89a059144c00628b6a1ddf7a16a2ac2c3e935b8591475f5043a7c7546668ab39abbc4717c75a6528 SHA512 bf13e2943593b153457c879e8ae11cef2d9185a986106a1e70946a260bd930505a5e10002c5a60888e11affc07713c367b8680fd511ad87b2e124d303a99 diff --git a/sys-devel/make/make-4.3.90.ebuild b/sys-devel/make/make-4.3.91.ebuild similarity index 100% rename from sys-devel/make/make-4.3.90.ebuild rename to sys-devel/make/make-4.3.91.ebuild
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 48d7190bec98c0a491159b68c80e31efbe62b496 Author: Sam James gentoo org> AuthorDate: Wed Sep 21 02:22:32 2022 + Commit: Sam James gentoo org> CommitDate: Wed Sep 21 02:22:38 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48d7190b sys-devel/make: fix metadata indentation Signed-off-by: Sam James gentoo.org> sys-devel/make/metadata.xml | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys-devel/make/metadata.xml b/sys-devel/make/metadata.xml index 1e62dd910293..fee78a624e6a 100644 --- a/sys-devel/make/metadata.xml +++ b/sys-devel/make/metadata.xml @@ -1,11 +1,11 @@ https://www.gentoo.org/dtd/metadata.dtd;> - - base-sys...@gentoo.org - Gentoo Base System - - - cpe:/a:gnu:make - + + base-sys...@gentoo.org + Gentoo Base System + + + cpe:/a:gnu:make +
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 83cb7017a272bbb9358beb7d08c2519e2dba533b Author: Sam James gentoo org> AuthorDate: Tue Sep 20 23:25:17 2022 + Commit: Sam James gentoo org> CommitDate: Tue Sep 20 23:25:49 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83cb7017 sys-devel/make: add 4.3.90 (RC1, unkeyworded) Signed-off-by: Sam James gentoo.org> sys-devel/make/Manifest | 2 ++ sys-devel/make/make-4.3.90.ebuild | 76 +++ 2 files changed, 78 insertions(+) diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest index f9cbb5a172f0..bb77625f205d 100644 --- a/sys-devel/make/Manifest +++ b/sys-devel/make/Manifest @@ -1,2 +1,4 @@ +DIST make-4.3.90.tar.gz 2235311 BLAKE2B 42717d885ae190b8abef2ec2431c061f4575c5818eff745fe445034813ce48f91134c2a54dce129d51ac45b7086a3ee65cb47d86ab98d2faf186947be3ec3455 SHA512 52151b4eeecfb5a94d4010eeb46b72a66eb3783a6ff1ab46fd6a1d1e9aeef14d62429414a3c5dec0d1f20cfad2ec82bf9c179dcfe5851f4353d7a2ff0498cb26 +DIST make-4.3.90.tar.gz.sig 566 BLAKE2B e72199bde5c4ba25f3f5a520c24d3c3f096c8295fd45184f6bbe35005fefe65c3e761db034224bcaffe255e4634739e87765b12ab0122bfe400f37e41fc25216 SHA512 60474c73e188591cecd4c63a108b72831a49d345f5dbc78271b80cd443c6271b0fabd95709e8c837eea2ad98f73119333d798fb6ac8a00e3d8d320d936bc5c6f DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b DIST make-4.3.tar.gz.sig 566 BLAKE2B 75bf71602e60f97ec8efa81676329047746d960257ef310b89a059144c00628b6a1ddf7a16a2ac2c3e935b8591475f5043a7c7546668ab39abbc4717c75a6528 SHA512 bf13e2943593b153457c879e8ae11cef2d9185a986106a1e70946a260bd930505a5e10002c5a60888e11affc07713c367b8680fd511ad87b2e124d303a99 diff --git a/sys-devel/make/make-4.3.90.ebuild b/sys-devel/make/make-4.3.90.ebuild new file mode 100644 index ..73a2aedb6375 --- /dev/null +++ b/sys-devel/make/make-4.3.90.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/make.asc +inherit flag-o-matic verify-sig + +DESCRIPTION="Standard tool to compile source trees" +HOMEPAGE="https://www.gnu.org/software/make/make.html; +if [[ ${PV} == ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/make.git; + inherit autotools git-r3 +elif [[ $(ver_cut 3) -ge 90 ]] ; then + SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.gz; + SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.gz.sig )" +else + SRC_URI="mirror://gnu/make/${P}.tar.gz" + SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="GPL-3+" +SLOT="0" +IUSE="guile nls static" + +DEPEND="guile? ( >=dev-scheme/guile-1.8:= )" +BDEPEND="nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-make )" +RDEPEND="${DEPEND} + nls? ( virtual/libintl )" + +PATCHES=( + "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch + "${FILESDIR}"/${PN}-4.2-default-cxx.patch +) + +src_unpack() { + if [[ ${PV} == ]] ; then + git-r3_src_unpack + + cd "${S}" || die + ./bootstrap || die + else + default + fi +} + +src_prepare() { + default + + if [[ ${PV} == ]] ; then + eautoreconf + fi +} + +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 +}
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 4933c3aa36b15cb369014552e50cd1a2d720fd68 Author: Sam James gentoo org> AuthorDate: Mon Aug 29 15:28:42 2022 + Commit: Sam James gentoo org> CommitDate: Mon Aug 29 15:31:25 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4933c3aa sys-devel/make: add Desirable for make --shuffle [0][1]. [0] https://trofi.github.io/posts/238-new-make-shuffle-mode.html [1] https://trofi.github.io/posts/249-an-update-on-make-shuffle.html Signed-off-by: Sam James gentoo.org> sys-devel/make/make-4.3.ebuild | 28 +-- .../make/{make-4.3.ebuild => make-.ebuild} | 32 ++ 2 files changed, 52 insertions(+), 8 deletions(-) diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild index 50caf0365bb0..e924bf762998 100644 --- a/sys-devel/make/make-4.3.ebuild +++ b/sys-devel/make/make-4.3.ebuild @@ -8,9 +8,12 @@ inherit flag-o-matic verify-sig DESCRIPTION="Standard tool to compile source trees" HOMEPAGE="https://www.gnu.org/software/make/make.html; -if [[ "$(ver_cut 3)" -ge 90 ]] ; then - SRC_URI="https://alpha.gnu.org/gnu//make/${P}.tar.gz; - SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu//make/${P}.tar.gz.sig )" +if [[ ${PV} == ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/make.git; + inherit autotools git-r3 +elif [[ $(ver_cut 3) -ge 90 ]] ; then + SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.gz; + SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.gz.sig )" else SRC_URI="mirror://gnu//make/${P}.tar.gz" SRC_URI+=" verify-sig? ( mirror://gnu//make/${P}.tar.gz.sig )" @@ -32,6 +35,25 @@ PATCHES=( "${FILESDIR}"/${PN}-4.2-default-cxx.patch ) +src_unpack() { + if [[ ${PV} == ]] ; then + git-r3_src_unpack + + cd "${S}" || die + ./bootstrap || die + else + default + fi +} + +src_prepare() { + default + + if [[ ${PV} == ]] ; then + eautoreconf + fi +} + src_configure() { use static && append-ldflags -static local myeconfargs=( diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-.ebuild similarity index 62% copy from sys-devel/make/make-4.3.ebuild copy to sys-devel/make/make-.ebuild index 50caf0365bb0..c0a4aa6ff54a 100644 --- a/sys-devel/make/make-4.3.ebuild +++ b/sys-devel/make/make-.ebuild @@ -1,20 +1,23 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/make.asc inherit flag-o-matic verify-sig DESCRIPTION="Standard tool to compile source trees" HOMEPAGE="https://www.gnu.org/software/make/make.html; -if [[ "$(ver_cut 3)" -ge 90 ]] ; then - SRC_URI="https://alpha.gnu.org/gnu//make/${P}.tar.gz; - SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu//make/${P}.tar.gz.sig )" +if [[ ${PV} == ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/make.git; + inherit autotools git-r3 +elif [[ $(ver_cut 3) -ge 90 ]] ; then + SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.gz; + SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.gz.sig )" else SRC_URI="mirror://gnu//make/${P}.tar.gz" SRC_URI+=" verify-sig? ( mirror://gnu//make/${P}.tar.gz.sig )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+" @@ -32,6 +35,25 @@ PATCHES=( "${FILESDIR}"/${PN}-4.2-default-cxx.patch ) +src_unpack() { + if [[ ${PV} == ]] ; then + git-r3_src_unpack + + cd "${S}" || die + ./bootstrap || die + else + default + fi +} + +src_prepare() { + default + + if [[ ${PV} == ]] ; then + eautoreconf + fi +} + src_configure() { use static && append-ldflags -static local myeconfargs=(
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/
commit: 2f57d1e86732ff5160de52e92584363cc0e256cb Author: Sam James gentoo org> AuthorDate: Fri Apr 29 06:08:10 2022 + Commit: Sam James gentoo org> CommitDate: Fri Apr 29 06:12:46 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f57d1e8 sys-devel/make: rebase patch paths Allows patching gnulib. Closes: https://bugs.gentoo.org/809416 Signed-off-by: Sam James gentoo.org> sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch | 4 ++-- sys-devel/make/files/make-4.2-default-cxx.patch | 6 ++ sys-devel/make/make-4.3.ebuild | 6 -- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch b/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch index d2f60ec91cc0..743583b5a0a3 100644 --- a/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch +++ b/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 a/default.c -+++ b/default.c +--- a/src/default.c b/src/default.c @@ -509,7 +509,11 @@ #ifdef __MSDOS__ ".LIBPATTERNS", "lib%.a $(DJDIR)/lib/lib%.a", diff --git a/sys-devel/make/files/make-4.2-default-cxx.patch b/sys-devel/make/files/make-4.2-default-cxx.patch index 4d592086a6ff..39e3ee0dd9f9 100644 --- a/sys-devel/make/files/make-4.2-default-cxx.patch +++ b/sys-devel/make/files/make-4.2-default-cxx.patch @@ -1,7 +1,5 @@ -diff --git a/default.c b/default.c -index 3d865c7..e8b3ed6 100644 a/default.c -+++ b/default.c +--- a/src/default.c b/src/default.c @@ -530,7 +530,7 @@ static const char *default_variables[] = "OBJC", "gcc", #else diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild index 0abf4bf6c87e..50caf0365bb0 100644 --- a/sys-devel/make/make-4.3.ebuild +++ b/sys-devel/make/make-4.3.ebuild @@ -32,12 +32,6 @@ PATCHES=( "${FILESDIR}"/${PN}-4.2-default-cxx.patch ) -src_prepare() { - # sources were moved into src directory - cd src || die - default -} - src_configure() { use static && append-ldflags -static local myeconfargs=(
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 7680e4a4a27eed792844a53761195e991473ecf7 Author: Sam James gentoo org> AuthorDate: Thu Apr 7 03:51:59 2022 + Commit: Sam James gentoo org> CommitDate: Thu Apr 7 03:57:23 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7680e4a4 sys-devel/make: add verify-sig Signed-off-by: Sam James gentoo.org> sys-devel/make/Manifest| 1 + sys-devel/make/make-4.3.ebuild | 11 --- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest index 34d9f6842b0f..f9cbb5a172f0 100644 --- a/sys-devel/make/Manifest +++ b/sys-devel/make/Manifest @@ -1 +1,2 @@ DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b +DIST make-4.3.tar.gz.sig 566 BLAKE2B 75bf71602e60f97ec8efa81676329047746d960257ef310b89a059144c00628b6a1ddf7a16a2ac2c3e935b8591475f5043a7c7546668ab39abbc4717c75a6528 SHA512 bf13e2943593b153457c879e8ae11cef2d9185a986106a1e70946a260bd930505a5e10002c5a60888e11affc07713c367b8680fd511ad87b2e124d303a99 diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild index bd0a3434e14e..e8c5f2009dca 100644 --- a/sys-devel/make/make-4.3.ebuild +++ b/sys-devel/make/make-4.3.ebuild @@ -1,24 +1,29 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/make.asc +inherit flag-o-matic verify-sig DESCRIPTION="Standard tool to compile source trees" HOMEPAGE="https://www.gnu.org/software/make/make.html; if [[ "$(ver_cut 3)" -ge 90 ]] ; then SRC_URI="https://alpha.gnu.org/gnu//make/${P}.tar.gz; + SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu//make/${P}.tar.gz.sig )" else SRC_URI="mirror://gnu//make/${P}.tar.gz" + SRC_URI+=" verify-sig? ( mirror://gnu//make/${P}.tar.gz.sig )" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi + LICENSE="GPL-3+" SLOT="0" IUSE="guile nls static" DEPEND="guile? ( >=dev-scheme/guile-1.8:= )" -BDEPEND="nls? ( sys-devel/gettext )" +BDEPEND="nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-make )" RDEPEND="${DEPEND} nls? ( virtual/libintl )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/files/, sys-devel/make/
commit: a744d84288f6863e0536e11460302232141f0c4a Author: David Seifert gentoo org> AuthorDate: Fri May 14 22:13:28 2021 + Commit: David Seifert gentoo org> CommitDate: Fri May 14 22:13:28 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a744d842 sys-devel/make: drop 4.2.1-r4 Signed-off-by: David Seifert gentoo.org> sys-devel/make/Manifest| 1 - .../make/files/make-4.2.1-glob-internals.patch | 67 - sys-devel/make/files/make-4.2.1-glob-v2.patch | 30 -- sys-devel/make/files/make-4.2.1-guile-2.2.patch| 320 - sys-devel/make/files/make-4.2.1-perl526.patch | 26 -- .../files/make-4.2.1-pselect-non-blocking.patch| 172 --- sys-devel/make/make-4.2.1-r4.ebuild| 59 7 files changed, 675 deletions(-) diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest index df3d822af62..34d9f6842b0 100644 --- a/sys-devel/make/Manifest +++ b/sys-devel/make/Manifest @@ -1,2 +1 @@ -DIST make-4.2.1.tar.bz2 1407126 BLAKE2B fa6d43f5fd46182182a296c58dcd138a1a4568104eda760bbb3c241c023dee216789cf3128e5ac2b416cec76e1ba82d5b5e7852da12e86138a7d0865c85a42b4 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8 DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b diff --git a/sys-devel/make/files/make-4.2.1-glob-internals.patch b/sys-devel/make/files/make-4.2.1-glob-internals.patch deleted file mode 100644 index 9f70ae2084f..000 --- a/sys-devel/make/files/make-4.2.1-glob-internals.patch +++ /dev/null @@ -1,67 +0,0 @@ -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/sys-devel/make/files/make-4.2.1-glob-v2.patch b/sys-devel/make/files/make-4.2.1-glob-v2.patch deleted file mode 100644 index e55a7790a3f..000 --- a/sys-devel/make/files/make-4.2.1-glob-v2.patch +++ /dev/null @@ -1,30 +0,0 @@ -http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116a914a325a0497721f5d8b58d5bba34d4 - make-4.2.1/configure 2016-06-11 01:03:21.0 +0200 -+++ make-4.2.1/configure 2016-06-11 01:03:21.0 +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.ac2016-06-06 14:27:31.0 +0200 -+++ make-4.2.1/configure.ac2016-06-06 14:27:31.0 +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
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 621f1fa364504be0da8981d2c7e5845a905f4a42 Author: Fabian Groffen gentoo org> AuthorDate: Wed Jan 6 15:31:57 2021 + Commit: Fabian Groffen gentoo org> CommitDate: Wed Jan 6 15:31:57 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=621f1fa3 sys-devel/make: drop x86-macos Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> sys-devel/make/make-4.2.1-r4.ebuild | 4 ++-- sys-devel/make/make-4.3.ebuild | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-devel/make/make-4.2.1-r4.ebuild b/sys-devel/make/make-4.2.1-r4.ebuild index e285a6b2b94..7879250d9da 100644 --- a/sys-devel/make/make-4.2.1-r4.ebuild +++ b/sys-devel/make/make-4.2.1-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu//make/${P}.tar.bz2" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="guile nls static" CDEPEND="guile? ( >=dev-scheme/guile-1.8:= )" diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild index 6695e87f0b3..6f8771ce9ab 100644 --- a/sys-devel/make/make-4.3.ebuild +++ b/sys-devel/make/make-4.3.ebuild @@ -11,7 +11,7 @@ if [[ "$(ver_cut 3)" -ge 90 ]] ; then SRC_URI="mirror://gnu-alpha//make/${P}.tar.gz" else SRC_URI="mirror://gnu//make/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 75fcc319f4c91810135f22f5cf899efb22bd1546 Author: Sam James gentoo org> AuthorDate: Mon Jan 4 17:27:42 2021 + Commit: Sam James gentoo org> CommitDate: Mon Jan 4 17:27:42 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75fcc319 sys-devel/make: Stabilize 4.3 s390, #738316 Signed-off-by: Sam James gentoo.org> sys-devel/make/make-4.3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild index 82ec364fbba..6695e87f0b3 100644 --- a/sys-devel/make/make-4.3.ebuild +++ b/sys-devel/make/make-4.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ if [[ "$(ver_cut 3)" -ge 90 ]] ; then SRC_URI="mirror://gnu-alpha//make/${P}.tar.gz" else SRC_URI="mirror://gnu//make/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 17adae1affba5f1740443d71f28e9269c8700b71 Author: Fabian Groffen gentoo org> AuthorDate: Sun Dec 27 18:17:56 2020 + Commit: Fabian Groffen gentoo org> CommitDate: Sun Dec 27 18:17:56 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17adae1a sys-devel/make: drop ppc-aix m68k-mint Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> sys-devel/make/make-4.2.1-r4.ebuild | 2 +- sys-devel/make/make-4.3.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/make/make-4.2.1-r4.ebuild b/sys-devel/make/make-4.2.1-r4.ebuild index 75ab98a32a7..e285a6b2b94 100644 --- a/sys-devel/make/make-4.2.1-r4.ebuild +++ b/sys-devel/make/make-4.2.1-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu//make/${P}.tar.bz2" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="guile nls static" CDEPEND="guile? ( >=dev-scheme/guile-1.8:= )" diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild index 7fa4cf16a3f..82ec364fbba 100644 --- a/sys-devel/make/make-4.3.ebuild +++ b/sys-devel/make/make-4.3.ebuild @@ -11,7 +11,7 @@ if [[ "$(ver_cut 3)" -ge 90 ]] ; then SRC_URI="mirror://gnu-alpha//make/${P}.tar.gz" else SRC_URI="mirror://gnu//make/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 79a2e0bcc5386ce92c9c5224f1b59f4cffba591f Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Dec 27 12:49:36 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Dec 27 12:51:08 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79a2e0bc sys-devel/make: stable 4.3 for hppa stable wrt bug #738316 Package-Manager: Portage-3.0.12, Repoman-3.0.2 RepoMan-Options: --include-arches="hppa" Signed-off-by: Sergei Trofimovich gentoo.org> sys-devel/make/make-4.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild index 2117d8090ea..7fa4cf16a3f 100644 --- a/sys-devel/make/make-4.3.ebuild +++ b/sys-devel/make/make-4.3.ebuild @@ -11,7 +11,7 @@ if [[ "$(ver_cut 3)" -ge 90 ]] ; then SRC_URI="mirror://gnu-alpha//make/${P}.tar.gz" else SRC_URI="mirror://gnu//make/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 7d6669fde396a492a7cd79806bc6593eb437d27b Author: Sergei Trofimovich gentoo org> AuthorDate: Thu Dec 24 18:40:27 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Thu Dec 24 22:06:34 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d6669fd sys-devel/make: stable 4.3 for ppc64 stable wrt bug #738316 Package-Manager: Portage-3.0.12, Repoman-3.0.2 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Sergei Trofimovich gentoo.org> sys-devel/make/make-4.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild index b33963b968b..2117d8090ea 100644 --- a/sys-devel/make/make-4.3.ebuild +++ b/sys-devel/make/make-4.3.ebuild @@ -11,7 +11,7 @@ if [[ "$(ver_cut 3)" -ge 90 ]] ; then SRC_URI="mirror://gnu-alpha//make/${P}.tar.gz" else SRC_URI="mirror://gnu//make/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 4696346279d3c808853ef5604bfdf42e098b7b86 Author: Sergei Trofimovich gentoo org> AuthorDate: Thu Dec 24 18:38:11 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Thu Dec 24 18:38:11 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46963462 sys-devel/make: stable 4.3 for sparc stable wrt bug #738316 Package-Manager: Portage-3.0.12, Repoman-3.0.2 RepoMan-Options: --include-arches="sparc" Signed-off-by: Sergei Trofimovich gentoo.org> sys-devel/make/make-4.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild index 2c3277a74c7..b33963b968b 100644 --- a/sys-devel/make/make-4.3.ebuild +++ b/sys-devel/make/make-4.3.ebuild @@ -11,7 +11,7 @@ if [[ "$(ver_cut 3)" -ge 90 ]] ; then SRC_URI="mirror://gnu-alpha//make/${P}.tar.gz" else SRC_URI="mirror://gnu//make/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: fa023f33f09446b08a8757db2a61d5a6748ff718 Author: Sam James gentoo org> AuthorDate: Mon Dec 21 20:33:12 2020 + Commit: Sam James gentoo org> CommitDate: Mon Dec 21 20:35:09 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa023f33 sys-devel/make: Stabilize 4.3 ppc, #738316 Signed-off-by: Sam James gentoo.org> sys-devel/make/make-4.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild index 4e380c97b30..9fa81b62f6a 100644 --- a/sys-devel/make/make-4.3.ebuild +++ b/sys-devel/make/make-4.3.ebuild @@ -11,7 +11,7 @@ if [[ "$(ver_cut 3)" -ge 90 ]] ; then SRC_URI="mirror://gnu-alpha//make/${P}.tar.gz" else SRC_URI="mirror://gnu//make/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 9f72a95f6d70119385a7d6c60ab17beecf31cc96 Author: Sam James gentoo org> AuthorDate: Mon Dec 21 20:34:02 2020 + Commit: Sam James gentoo org> CommitDate: Mon Dec 21 20:35:10 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f72a95f sys-devel/make: Stabilize 4.3 arm64, #738316 Signed-off-by: Sam James gentoo.org> sys-devel/make/make-4.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild index 9fa81b62f6a..2c3277a74c7 100644 --- a/sys-devel/make/make-4.3.ebuild +++ b/sys-devel/make/make-4.3.ebuild @@ -11,7 +11,7 @@ if [[ "$(ver_cut 3)" -ge 90 ]] ; then SRC_URI="mirror://gnu-alpha//make/${P}.tar.gz" else SRC_URI="mirror://gnu//make/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 7b5ae1bd2206052b9c178855d401a3f76424228f Author: Sam James gentoo org> AuthorDate: Mon Dec 21 18:29:13 2020 + Commit: Sam James gentoo org> CommitDate: Mon Dec 21 18:29:40 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b5ae1bd sys-devel/make: Stabilize 4.3 amd64, #738316 Signed-off-by: Sam James gentoo.org> sys-devel/make/make-4.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild index 468ed639d81..4e380c97b30 100644 --- a/sys-devel/make/make-4.3.ebuild +++ b/sys-devel/make/make-4.3.ebuild @@ -11,7 +11,7 @@ if [[ "$(ver_cut 3)" -ge 90 ]] ; then SRC_URI="mirror://gnu-alpha//make/${P}.tar.gz" else SRC_URI="mirror://gnu//make/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 4d7cae90355075f7504fd3dca2e58a6d79fcb9db Author: Sam James gentoo org> AuthorDate: Mon Dec 21 18:27:31 2020 + Commit: Sam James gentoo org> CommitDate: Mon Dec 21 18:27:31 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d7cae90 sys-devel/make: Stabilize 4.3 arm, #738316 Signed-off-by: Sam James gentoo.org> sys-devel/make/make-4.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild index 0c5b591e2ec..468ed639d81 100644 --- a/sys-devel/make/make-4.3.ebuild +++ b/sys-devel/make/make-4.3.ebuild @@ -11,7 +11,7 @@ if [[ "$(ver_cut 3)" -ge 90 ]] ; then SRC_URI="mirror://gnu-alpha//make/${P}.tar.gz" else SRC_URI="mirror://gnu//make/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 3aea9693ff69f8ebf979b4db827c6d6fc6c60be9 Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Dec 21 01:37:13 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Dec 21 01:37:13 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aea9693 sys-devel/make: x86 stable (bug #738316) Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Thomas Deutschmann gentoo.org> sys-devel/make/make-4.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3.ebuild index 08f05795abe..0c5b591e2ec 100644 --- a/sys-devel/make/make-4.3.ebuild +++ b/sys-devel/make/make-4.3.ebuild @@ -11,7 +11,7 @@ if [[ "$(ver_cut 3)" -ge 90 ]] ; then SRC_URI="mirror://gnu-alpha//make/${P}.tar.gz" else SRC_URI="mirror://gnu//make/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-3+" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 167f932b8665d67f7081f7ac02918002eae577df Author: Roy Yang google com> AuthorDate: Sat May 2 22:16:50 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Mon May 4 17:35:41 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=167f932b Fixed CPE tag for sys-devel/make Signed-off-by: Roy Yang google.com> Signed-off-by: Thomas Deutschmann gentoo.org> sys-devel/make/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys-devel/make/metadata.xml b/sys-devel/make/metadata.xml index 56c12441305..578976c4fb5 100644 --- a/sys-devel/make/metadata.xml +++ b/sys-devel/make/metadata.xml @@ -5,4 +5,7 @@ base-sys...@gentoo.org Gentoo Base System + + cpe:/a:gnu:make +
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 0f099b677fd61f5c7ad8f665938718470338caa5 Author: Lars Wendler gentoo org> AuthorDate: Mon Jan 20 08:40:28 2020 + Commit: Lars Wendler gentoo org> CommitDate: Mon Jan 20 08:41:39 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f099b67 sys-devel/make: Bump to version 4.3. Removed old Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Lars Wendler gentoo.org> sys-devel/make/Manifest| 2 +- sys-devel/make/{make-4.2.93.ebuild => make-4.3.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest index 01d9fce14e6..df3d822af62 100644 --- a/sys-devel/make/Manifest +++ b/sys-devel/make/Manifest @@ -1,2 +1,2 @@ DIST make-4.2.1.tar.bz2 1407126 BLAKE2B fa6d43f5fd46182182a296c58dcd138a1a4568104eda760bbb3c241c023dee216789cf3128e5ac2b416cec76e1ba82d5b5e7852da12e86138a7d0865c85a42b4 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8 -DIST make-4.2.93.tar.gz 2313489 BLAKE2B d6d52b9e87d4b7855c0c930207e4c539bc6c6f97712e154b0eb967cec299506b267880f76a76df913b5d9cc1ed5db0e4bf4998379ff9b958cff7524b3992e444 SHA512 d47d722eecb32576a5396b6553d48c7db2443477aacec467e08ecfe3971ccdc309267ccb3ebb4cdca9201a60fa3ea6e775a8148dfd4e38aa93edb73632552485 +DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b diff --git a/sys-devel/make/make-4.2.93.ebuild b/sys-devel/make/make-4.3.ebuild similarity index 100% rename from sys-devel/make/make-4.2.93.ebuild rename to sys-devel/make/make-4.3.ebuild
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 133736450b352c2010d56b1ff4e65807e66add9a Author: Lars Wendler gentoo org> AuthorDate: Fri Jan 17 16:54:34 2020 + Commit: Lars Wendler gentoo org> CommitDate: Fri Jan 17 16:59:11 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13373645 sys-devel/make: Bump to version 4.2.93 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Lars Wendler gentoo.org> sys-devel/make/Manifest | 1 + sys-devel/make/make-4.2.93.ebuild | 55 +++ 2 files changed, 56 insertions(+) diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest index 7ce526e76ca..01d9fce14e6 100644 --- a/sys-devel/make/Manifest +++ b/sys-devel/make/Manifest @@ -1 +1,2 @@ DIST make-4.2.1.tar.bz2 1407126 BLAKE2B fa6d43f5fd46182182a296c58dcd138a1a4568104eda760bbb3c241c023dee216789cf3128e5ac2b416cec76e1ba82d5b5e7852da12e86138a7d0865c85a42b4 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8 +DIST make-4.2.93.tar.gz 2313489 BLAKE2B d6d52b9e87d4b7855c0c930207e4c539bc6c6f97712e154b0eb967cec299506b267880f76a76df913b5d9cc1ed5db0e4bf4998379ff9b958cff7524b3992e444 SHA512 d47d722eecb32576a5396b6553d48c7db2443477aacec467e08ecfe3971ccdc309267ccb3ebb4cdca9201a60fa3ea6e775a8148dfd4e38aa93edb73632552485 diff --git a/sys-devel/make/make-4.2.93.ebuild b/sys-devel/make/make-4.2.93.ebuild new file mode 100644 index 000..e15a331d242 --- /dev/null +++ b/sys-devel/make/make-4.2.93.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic + +DESCRIPTION="Standard tool to compile source trees" +HOMEPAGE="https://www.gnu.org/software/make/make.html; +if [[ "$(ver_cut 3)" -ge 90 ]] ; then + SRC_URI="mirror://gnu-alpha//make/${P}.tar.gz" +else + SRC_URI="mirror://gnu//make/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi +LICENSE="GPL-3+" +SLOT="0" +IUSE="guile nls static" + +DEPEND="guile? ( >=dev-scheme/guile-1.8:= )" +BDEPEND="nls? ( sys-devel/gettext )" +RDEPEND="${DEPEND} + nls? ( virtual/libintl )" + +PATCHES=( + "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch + "${FILESDIR}"/${PN}-4.2-default-cxx.patch +) + +src_prepare() { + # sources were moved into src directory + cd src || die + default +} + +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 +}
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 0ff216c797d5fb25ac8e49afa429f3e30374cea1 Author: Mikle Kolyada gentoo org> AuthorDate: Fri May 3 23:21:06 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri May 3 23:21:06 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ff216c7 sys-devel/make: Add ~riscv keyword Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 sys-devel/make/make-4.2.1-r4.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/make/make-4.2.1-r4.ebuild b/sys-devel/make/make-4.2.1-r4.ebuild index 54f3b14943e..e6baaf88f00 100644 --- a/sys-devel/make/make-4.2.1-r4.ebuild +++ b/sys-devel/make/make-4.2.1-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -11,7 +11,7 @@ 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" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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:= )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 739bc8ad18612f6a04f867b0490ab1c3744f9f5a Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Aug 31 03:21:39 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Aug 31 03:26:07 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=739bc8ad sys-devel/make: move stable keywords Package-Manager: Portage-2.3.48, Repoman-2.3.10 sys-devel/make/make-4.2.1-r3.ebuild | 58 - sys-devel/make/make-4.2.1-r4.ebuild | 2 +- 2 files changed, 1 insertion(+), 59 deletions(-) diff --git a/sys-devel/make/make-4.2.1-r3.ebuild b/sys-devel/make/make-4.2.1-r3.ebuild deleted file mode 100644 index 2dde5c8ffbf..000 --- a/sys-devel/make/make-4.2.1-r3.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# 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 -) - -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 -} diff --git a/sys-devel/make/make-4.2.1-r4.ebuild b/sys-devel/make/make-4.2.1-r4.ebuild index 980182aba24..54f3b14943e 100644 --- a/sys-devel/make/make-4.2.1-r4.ebuild +++ b/sys-devel/make/make-4.2.1-r4.ebuild @@ -11,7 +11,7 @@ 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" +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:= )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/
commit: b44bbe136afc2747df3f213467dd930c44454408 Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Aug 27 19:48:25 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Aug 27 19:48:25 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b44bbe13 sys-devel/make: Use a non-blocking read with pselect to avoid hangs Closes: https://bugs.gentoo.org/664632 Package-Manager: Portage-2.3.48, Repoman-2.3.10 .../files/make-4.2.1-pselect-non-blocking.patch| 172 + sys-devel/make/make-4.2.1-r4.ebuild| 59 +++ 2 files changed, 231 insertions(+) diff --git a/sys-devel/make/files/make-4.2.1-pselect-non-blocking.patch b/sys-devel/make/files/make-4.2.1-pselect-non-blocking.patch new file mode 100644 index 000..61e19516f3c --- /dev/null +++ b/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 (); + +- FD_ZERO (); +- FD_SET (job_fds[0], ); +- + if (timeout) + { + /* Alarm after one second (is this too granular?) */ +@@ -256,28 +277,52 @@ jobserver_acquire (int timeout) + specp = + } + +- r = pselect (job_fds[0]+1, , NULL, NULL, specp, ); +- +- 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 (); ++ FD_SET (job_fds[0], ); + +- /* The read FD is ready: read it! */ +- EINTRLOOP (r, read (job_fds[0], , 1)); +- if (r < 0) +-pfatal_with_name (_("read jobs pipe")); ++ r = pselect (job_fds[0]+1, , NULL, NULL, specp, ); ++ 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
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/
commit: 8ea00fef95af2f301e96691ccda3d845811941ac Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Aug 4 13:49:14 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Aug 4 13:51:41 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ea00fef sys-devel/make: drop old Package-Manager: Portage-2.3.44, Repoman-2.3.10 sys-devel/make/Manifest| 1 - .../make-4.1-fix_null_returns_from_ttyname.patch | 53 sys-devel/make/make-4.1-r1.ebuild | 46 - sys-devel/make/make-4.2.1-r2.ebuild| 57 -- sys-devel/make/make-4.2.1.ebuild | 50 --- 5 files changed, 207 deletions(-) diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest index a83ec28d8dc..7ce526e76ca 100644 --- a/sys-devel/make/Manifest +++ b/sys-devel/make/Manifest @@ -1,2 +1 @@ -DIST make-4.1.tar.bz2 1327342 BLAKE2B 4a93f893d219e2ac16a87f19de018f1d794a1f4c70c2a57dea52ccaa452b288bfbea0e422a880efcb457f666f41a40913a214e0feae4cc7edcebb8ec945bd72c SHA512 3fcaf06660b7a5019937b81ee69fe54cdfe0a24d66286fc5cc6a34fa996d76dfe6fd5bc49ee59b727ae2b24ddca261ada0fdb5873ba2b38dcc63647ad3cdb193 DIST make-4.2.1.tar.bz2 1407126 BLAKE2B fa6d43f5fd46182182a296c58dcd138a1a4568104eda760bbb3c241c023dee216789cf3128e5ac2b416cec76e1ba82d5b5e7852da12e86138a7d0865c85a42b4 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8 diff --git a/sys-devel/make/files/make-4.1-fix_null_returns_from_ttyname.patch b/sys-devel/make/files/make-4.1-fix_null_returns_from_ttyname.patch deleted file mode 100644 index f6be5c9f06a..000 --- a/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 + -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/sys-devel/make/make-4.1-r1.ebuild b/sys-devel/make/make-4.1-r1.ebuild deleted file mode 100644 index b893857aa79..000 --- a/sys-devel/make/make-4.1-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 ~x86-fbsd ~amd64-linux ~arm-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()
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 5f32f7a6fc9d919d6812ce1a0eeecbf7ff59fa26 Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Aug 4 13:48:12 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Aug 4 13:51:39 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f32f7a6 sys-devel/make: move stable keywords Closes: https://bugs.gentoo.org/662730 Package-Manager: Portage-2.3.44, Repoman-2.3.10 sys-devel/make/make-4.2.1-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.2.1-r3.ebuild b/sys-devel/make/make-4.2.1-r3.ebuild index ca1d92161ca..fe321202377 100644 --- a/sys-devel/make/make-4.2.1-r3.ebuild +++ b/sys-devel/make/make-4.2.1-r3.ebuild @@ -11,7 +11,7 @@ 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +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 ~arm-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:= )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 3d0598f23fc67ea998f384c25b6083a9676da027 Author: Mart Raudsepp gentoo org> AuthorDate: Wed May 30 10:09:52 2018 + Commit: Mart Raudsepp gentoo org> CommitDate: Wed May 30 12:03:03 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d0598f2 sys-devel/make-4.2.1: arm64 stable Package-Manager: Portage-2.3.28, Repoman-2.3.9 sys-devel/make/make-4.2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.2.1.ebuild b/sys-devel/make/make-4.2.1.ebuild index 05d12e38104..807b071729f 100644 --- a/sys-devel/make/make-4.2.1.ebuild +++ b/sys-devel/make/make-4.2.1.ebuild @@ -11,7 +11,7 @@ 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +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 ~arm-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:= )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/
commit: 5afc3c3f86bba087cd1542759f21a0d5814bebd6 Author: Lars Wendler gentoo org> AuthorDate: Fri Mar 16 08:47:10 2018 + Commit: Lars Wendler gentoo org> CommitDate: Fri Mar 16 08:47:10 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5afc3c3f sys-devel/make: Revbump to support guile-2.2 wih USE="guile" Thanks-to: Benda Xu gentoo.org> Closes: https://bugs.gentoo.org/650608 Package-Manager: Portage-2.3.24, Repoman-2.3.6 sys-devel/make/files/make-4.2.1-guile-2.2.patch | 320 sys-devel/make/make-4.2.1-r3.ebuild | 58 + 2 files changed, 378 insertions(+) diff --git a/sys-devel/make/files/make-4.2.1-guile-2.2.patch b/sys-devel/make/files/make-4.2.1-guile-2.2.patch new file mode 100644 index 000..b7f9eb50b78 --- /dev/null +++ b/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.0 +0200 make-4.2.1/configure 2016-06-11 01:03:21.0 +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}:
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/
commit: d7d3d41c716b3081822fd5cc9d0e05e7657f7735 Author: Lars Wendler gentoo org> AuthorDate: Fri Mar 16 08:31:04 2018 + Commit: Lars Wendler gentoo org> CommitDate: Fri Mar 16 08:31:04 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7d3d41c sys-devel/make: Removed old. Package-Manager: Portage-2.3.24, Repoman-2.3.6 sys-devel/make/Manifest | 1 - sys-devel/make/files/make-4.0-char-cast.patch | 46 --- sys-devel/make/make-4.0-r1.ebuild | 46 --- 3 files changed, 93 deletions(-) diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest index ca6cf7d048b..a83ec28d8dc 100644 --- a/sys-devel/make/Manifest +++ b/sys-devel/make/Manifest @@ -1,3 +1,2 @@ -DIST make-4.0.tar.bz2 1341927 BLAKE2B 84cef70a3611da0172610f083ba18f87317c6bf89a71e53ebd7ed6881a6bc1c81897167cdd9dc09ba4754479b6337c746eb2716b2925aeae7d6488a3c1a81771 SHA512 82de265963cd08701491e02a4917cd2097762657257a9508119e5847050d0cb15580c163159463e822860435c5910190677d8e4aba644ba75df2895f26117376 DIST make-4.1.tar.bz2 1327342 BLAKE2B 4a93f893d219e2ac16a87f19de018f1d794a1f4c70c2a57dea52ccaa452b288bfbea0e422a880efcb457f666f41a40913a214e0feae4cc7edcebb8ec945bd72c SHA512 3fcaf06660b7a5019937b81ee69fe54cdfe0a24d66286fc5cc6a34fa996d76dfe6fd5bc49ee59b727ae2b24ddca261ada0fdb5873ba2b38dcc63647ad3cdb193 DIST make-4.2.1.tar.bz2 1407126 BLAKE2B fa6d43f5fd46182182a296c58dcd138a1a4568104eda760bbb3c241c023dee216789cf3128e5ac2b416cec76e1ba82d5b5e7852da12e86138a7d0865c85a42b4 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8 diff --git a/sys-devel/make/files/make-4.0-char-cast.patch b/sys-devel/make/files/make-4.0-char-cast.patch deleted file mode 100644 index 129f5409204..000 --- a/sys-devel/make/files/make-4.0-char-cast.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://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 + -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 0x - #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 000..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/sys-devel/make/make-4.0-r1.ebuild b/sys-devel/make/make-4.0-r1.ebuild deleted file mode 100644 index 57aea69cf2c..000 --- a/sys-devel/make/make-4.0-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 ~x86-fbsd ~amd64-linux ~arm-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
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: eb7f5e22571cbf68b30f36ba81b8e6cc1b4cf7c7 Author: Lars Wendler gentoo org> AuthorDate: Mon Feb 19 15:47:06 2018 + Commit: Lars Wendler gentoo org> CommitDate: Mon Feb 19 15:47:06 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb7f5e22 sys-devel/make: Fixed typo in a comment. Thanks Arfrever! Package-Manager: Portage-2.3.24, Repoman-2.3.6 sys-devel/make/make-4.2.1-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.2.1-r2.ebuild b/sys-devel/make/make-4.2.1-r2.ebuild index 16e61927b88..c52a434b513 100644 --- a/sys-devel/make/make-4.2.1-r2.ebuild +++ b/sys-devel/make/make-4.2.1-r2.ebuild @@ -29,7 +29,7 @@ PATCHES=( src_prepare() { default - # This patch requires special handling as it modifies confiure.ac + # This patch requires special handling as it modifies configure.ac # which in turn triggers maintainer-mode when being applied the # usual way. eapply -Z "${FILESDIR}"/${PN}-4.2.1-glob-v2.patch
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/
commit: ab1aff5e6534f82e523cd191cca8230f83c21024 Author: Lars Wendler gentoo org> AuthorDate: Mon Feb 19 08:45:30 2018 + Commit: Lars Wendler gentoo org> CommitDate: Mon Feb 19 08:45:57 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab1aff5e sys-devel/make: Revbump to avoid maintainer mode. Closes: https://bugs.gentoo.org/648034 Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../make-3.82-darwin-library_search-dylib.patch| 4 +-- sys-devel/make/files/make-4.2.1-glob-v2.patch | 34 -- .../{make-4.2.1-r1.ebuild => make-4.2.1-r2.ebuild} | 20 - 3 files changed, 32 insertions(+), 26 deletions(-) diff --git a/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch b/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch index de7e4f61521..d2f60ec91cc 100644 --- a/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch +++ b/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/sys-devel/make/files/make-4.2.1-glob-v2.patch b/sys-devel/make/files/make-4.2.1-glob-v2.patch index a9aeb787cd7..e55a7790a3f 100644 --- a/sys-devel/make/files/make-4.2.1-glob-v2.patch +++ b/sys-devel/make/files/make-4.2.1-glob-v2.patch @@ -1,17 +1,22 @@ -From 48c8a116a914a325a0497721f5d8b58d5bba34d4 Mon Sep 17 00:00:00 2001 -From: Paul Smith-Date: Sun, 19 Nov 2017 15:09:16 -0500 -Subject: [PATCH] * configure.ac: Support GLIBC glob interface version 2 +http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116a914a325a0497721f5d8b58d5bba34d4 - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8c72568..4710832 100644 a/configure.ac -+++ b/configure.ac -@@ -404,10 +404,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob], +--- make-4.2.1/configure 2016-06-11 01:03:21.0 +0200 make-4.2.1/configure 2016-06-11 01:03:21.0 +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.ac2016-06-06 14:27:31.0 +0200 make-4.2.1/configure.ac2016-06-06 14:27:31.0 +0200 +@@ -399,10 +399,9 @@ #include #include @@ -23,6 +28,3 @@ index 8c72568..4710832 100644 gnu glob # endif #endif], --- -2.16.1 - diff --git a/sys-devel/make/make-4.2.1-r1.ebuild b/sys-devel/make/make-4.2.1-r2.ebuild similarity index 80% rename from sys-devel/make/make-4.2.1-r1.ebuild rename to sys-devel/make/make-4.2.1-r2.ebuild index d0f079cef26..16e61927b88 100644 --- a/sys-devel/make/make-4.2.1-r1.ebuild +++ b/sys-devel/make/make-4.2.1-r2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit flag-o-matic eutils +inherit flag-o-matic DESCRIPTION="Standard tool to compile source trees" HOMEPAGE="https://www.gnu.org/software/make/make.html; @@ -25,20 +25,24 @@ PATCHES=( "${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-glob-v2.patch ) src_prepare() { - epatch "${PATCHES[@]}" - epatch_user + default + # This patch requires special handling as it modifies confiure.ac + # which in turn triggers maintainer-mode when being applied the + # usual way. + eapply -Z "${FILESDIR}"/${PN}-4.2.1-glob-v2.patch } src_configure() { use static && append-ldflags -static - econf \ - --program-prefix=g \ - $(use_with guile) \ + local myeconfargs=( + --program-prefix=g + $(use_with guile) $(use_enable nls) + ) + econf "${myeconfargs[@]}" } src_install() {
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/files/, sys-devel/make/
commit: 7fedeea1187d03f8e755542c2fd4a982e15b9046 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sun Feb 11 00:08:51 2018 + Commit: Andreas Hüttel gentoo org> CommitDate: Sun Feb 11 00:08:51 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fedeea1 sys-devel/make: Fix build and tests with sys-libs/glibc-2.27, bug 646558 Closes: https://bugs.gentoo.org/646558 Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../make/files/make-4.2.1-glob-internals.patch | 67 ++ sys-devel/make/files/make-4.2.1-glob-v2.patch | 28 + sys-devel/make/make-4.2.1-r1.ebuild| 2 + 3 files changed, 97 insertions(+) diff --git a/sys-devel/make/files/make-4.2.1-glob-internals.patch b/sys-devel/make/files/make-4.2.1-glob-internals.patch new file mode 100644 index 000..9f70ae2084f --- /dev/null +++ b/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/sys-devel/make/files/make-4.2.1-glob-v2.patch b/sys-devel/make/files/make-4.2.1-glob-v2.patch new file mode 100644 index 000..a9aeb787cd7 --- /dev/null +++ b/sys-devel/make/files/make-4.2.1-glob-v2.patch @@ -0,0 +1,28 @@ +From 48c8a116a914a325a0497721f5d8b58d5bba34d4 Mon Sep 17 00:00:00 2001 +From: Paul Smith +Date: Sun, 19 Nov 2017 15:09:16 -0500 +Subject: [PATCH] * configure.ac: Support GLIBC glob interface version 2 + +--- + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 8c72568..4710832 100644 +--- a/configure.ac b/configure.ac +@@ -404,10 +404,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob], + #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], +-- +2.16.1 + diff --git a/sys-devel/make/make-4.2.1-r1.ebuild b/sys-devel/make/make-4.2.1-r1.ebuild index 56c8753a0e7..d0f079cef26 100644 --- a/sys-devel/make/make-4.2.1-r1.ebuild +++ b/sys-devel/make/make-4.2.1-r1.ebuild @@ -24,6 +24,8 @@ 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-glob-v2.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/files/
commit: cf31bf20e4026d1544bd1fb08ab9e93ef22a3c15 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sun Feb 11 00:03:46 2018 + Commit: Andreas Hüttel gentoo org> CommitDate: Sun Feb 11 00:03:55 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf31bf20 sys-devel/make: Add missing patch, bug 613772 Bug: https://bugs.gentoo.org/613772 Package-Manager: Portage-2.3.24, Repoman-2.3.6 sys-devel/make/files/make-4.2.1-perl526.patch | 26 ++ 1 file changed, 26 insertions(+) diff --git a/sys-devel/make/files/make-4.2.1-perl526.patch b/sys-devel/make/files/make-4.2.1-perl526.patch new file mode 100644 index 000..a935d1314eb --- /dev/null +++ b/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 +
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/
commit: 4d1b735c647c1047434ab052ffb32913784e5f1a Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Feb 10 23:40:44 2018 + Commit: Andreas Hüttel gentoo org> CommitDate: Sat Feb 10 23:40:59 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d1b735c sys-devel/make: Remove old Package-Manager: Portage-2.3.24, Repoman-2.3.6 sys-devel/make/Manifest| 3 - sys-devel/make/files/3.80-memory.patch | 77 -- .../make/files/make-3.80-conditional-eval.patch| 157 - .../files/make-3.80-parallel-build-failure.patch | 59 sys-devel/make/files/make-3.81-jobserver.patch | 19 --- sys-devel/make/files/make-3.81-long-cmdline.patch | 100 - sys-devel/make/files/make-3.81-tests-lang.patch| 55 .../make/files/make-3.81-tests-recursion.patch | 14 -- .../make/files/make-3.82-MAKEFLAGS-reexec.patch| 14 -- .../make/files/make-3.82-archives-many-objs.patch | 60 .../files/make-3.82-construct-command-line.patch | 71 -- .../make/files/make-3.82-copy-on-expand.patch | 58 sys-devel/make/files/make-3.82-glob-speedup.patch | 104 -- .../files/make-3.82-intermediate-parallel.patch| 62 .../make/files/make-3.82-long-command-line.patch | 54 --- .../make/files/make-3.82-memory-corruption.patch | 37 - sys-devel/make/files/make-3.82-oneshell.patch | 24 .../make/files/make-3.82-parallel-remake.patch | 39 - sys-devel/make/make-3.80-r4.ebuild | 42 -- sys-devel/make/make-3.81-r2.ebuild | 45 -- sys-devel/make/make-3.82-r4.ebuild | 50 --- 21 files changed, 1144 deletions(-) diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest index eba83ae27d0..ca6cf7d048b 100644 --- a/sys-devel/make/Manifest +++ b/sys-devel/make/Manifest @@ -1,6 +1,3 @@ -DIST make-3.80.tar.bz2 920645 BLAKE2B 524d59d1e1518dbeb527475e07b187533fd1cc2233b01470e50329bf1069b0367185080355c557461b0fc5b8434e451718a9f459a03a10ecf093bb5f433321f9 SHA512 aadabe1f6a3acd438597b24465e06e34343fb020b4ca9336d2aa5b572ce530622785dde8215b3f4332ff75928f72c269b9b83dfecf470f522285e27109b7bdfd -DIST make-3.81.tar.bz2 1151445 BLAKE2B 097f648459688d48cef8d4ef35d6de6f946801413ab3c3900d6c1b9fd3e2207cbcedfcb45ae4527b8996205d5a31c248afb14ed5de5e47db74d4ddb0a7ab0edf SHA512 f38b8219a966b4756149a13435f5b9dc760814aa62c6add8e1760e602f65a83cd0a45ed457a5dbdd2fab91043af4de2c60e62154f95c6b625af3703c824eb653 -DIST make-3.82.tar.bz2 1242186 BLAKE2B 4e5d7664fffdc60e250eb896168102c150884dfe98736f1194a893ab29fffca7dd4fa3f226eccc80892267ceb41c9e8774fbb80c9dc36723918258e63d176d98 SHA512 3260be0d1a9a7c5eb0dbb87179a9a9521fdfc7809ca51f13ee5a37ba5e63d21ad50a4249ec7d3929a9d0ce8c8f6cf302558743964f0f7ff742efe283b91df9de DIST make-4.0.tar.bz2 1341927 BLAKE2B 84cef70a3611da0172610f083ba18f87317c6bf89a71e53ebd7ed6881a6bc1c81897167cdd9dc09ba4754479b6337c746eb2716b2925aeae7d6488a3c1a81771 SHA512 82de265963cd08701491e02a4917cd2097762657257a9508119e5847050d0cb15580c163159463e822860435c5910190677d8e4aba644ba75df2895f26117376 DIST make-4.1.tar.bz2 1327342 BLAKE2B 4a93f893d219e2ac16a87f19de018f1d794a1f4c70c2a57dea52ccaa452b288bfbea0e422a880efcb457f666f41a40913a214e0feae4cc7edcebb8ec945bd72c SHA512 3fcaf06660b7a5019937b81ee69fe54cdfe0a24d66286fc5cc6a34fa996d76dfe6fd5bc49ee59b727ae2b24ddca261ada0fdb5873ba2b38dcc63647ad3cdb193 DIST make-4.2.1.tar.bz2 1407126 BLAKE2B fa6d43f5fd46182182a296c58dcd138a1a4568104eda760bbb3c241c023dee216789cf3128e5ac2b416cec76e1ba82d5b5e7852da12e86138a7d0865c85a42b4 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8 diff --git a/sys-devel/make/files/3.80-memory.patch b/sys-devel/make/files/3.80-memory.patch deleted file mode 100644 index 663acf52d77..000 --- a/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 - 1.24 -+++ variable.h 25 Oct 2002 21:37:32 - -@@ -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
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: c9236f48271f0427ee50801a84f2f2a18734bf57 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Feb 10 23:38:36 2018 + Commit: Andreas Hüttel gentoo org> CommitDate: Sat Feb 10 23:40:59 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9236f48 sys-devel/make: Fix tests with Perl 5.26, bug 613772 Closes: https://bugs.gentoo.org/613772 Package-Manager: Portage-2.3.24, Repoman-2.3.6 sys-devel/make/make-4.2.1-r1.ebuild | 2 ++ sys-devel/make/make-4.2.1.ebuild| 2 ++ 2 files changed, 4 insertions(+) diff --git a/sys-devel/make/make-4.2.1-r1.ebuild b/sys-devel/make/make-4.2.1-r1.ebuild index 6a81c5417ba..56c8753a0e7 100644 --- a/sys-devel/make/make-4.2.1-r1.ebuild +++ b/sys-devel/make/make-4.2.1-r1.ebuild @@ -23,10 +23,12 @@ RDEPEND="${CDEPEND} PATCHES=( "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch "${FILESDIR}"/${PN}-4.2-default-cxx.patch + "${FILESDIR}"/${PN}-4.2.1-perl526.patch ) src_prepare() { epatch "${PATCHES[@]}" + epatch_user } src_configure() { diff --git a/sys-devel/make/make-4.2.1.ebuild b/sys-devel/make/make-4.2.1.ebuild index 7433acf5696..05d12e38104 100644 --- a/sys-devel/make/make-4.2.1.ebuild +++ b/sys-devel/make/make-4.2.1.ebuild @@ -22,10 +22,12 @@ RDEPEND="${CDEPEND} PATCHES=( "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch + "${FILESDIR}"/${PN}-4.2.1-perl526.patch ) src_prepare() { epatch "${PATCHES[@]}" + epatch_user } src_configure() {
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/
commit: 41815b5598cad067c07e1c6f09b118e2114a675f Author: Lei Zhang gmail com> AuthorDate: Wed Jul 27 21:36:35 2016 + Commit: Michał Górny gentoo org> CommitDate: Fri Apr 14 16:27:59 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41815b55 sys-devel/make: default CXX to c++ instead of g++, #589894 Now with ~arch revbump! Closes: https://github.com/gentoo/gentoo/pull/1982 Package-Manager: portage-2.2.28 Reviewed-by: Anthony G. Basile gentoo.org> sys-devel/make/files/make-4.2-default-cxx.patch | 13 +++ sys-devel/make/make-4.2.1-r1.ebuild | 49 + 2 files changed, 62 insertions(+) diff --git a/sys-devel/make/files/make-4.2-default-cxx.patch b/sys-devel/make/files/make-4.2-default-cxx.patch new file mode 100644 index 000..4d592086a6f --- /dev/null +++ b/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/sys-devel/make/make-4.2.1-r1.ebuild b/sys-devel/make/make-4.2.1-r1.ebuild new file mode 100644 index 000..2b944c675fa --- /dev/null +++ b/sys-devel/make/make-4.2.1-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 +) + +src_prepare() { + epatch "${PATCHES[@]}" +} + +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 +}
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/files/, sys-devel/make/
commit: 4fc1e8ada0799f72570e3c362af703dc17f81650 Author: Michał Górny gentoo org> AuthorDate: Fri Apr 14 16:24:20 2017 + Commit: Michał Górny gentoo org> CommitDate: Fri Apr 14 16:27:58 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fc1e8ad Revert "sys-devel/make: default CXX to c++ instead of g++, #589894" The change was accidentally done to the stable ebuild. Will reland with ~arch revbump. Reverts: bace4a893fbf789675d576be2a291aef33db90f5 sys-devel/make/files/make-4.2-default-cxx.patch| 13 - sys-devel/make/{make-4.2.1-r1.ebuild => make-4.2.1.ebuild} | 1 - 2 files changed, 14 deletions(-) diff --git a/sys-devel/make/files/make-4.2-default-cxx.patch b/sys-devel/make/files/make-4.2-default-cxx.patch deleted file mode 100644 index 4d592086a6f..000 --- a/sys-devel/make/files/make-4.2-default-cxx.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/sys-devel/make/make-4.2.1-r1.ebuild b/sys-devel/make/make-4.2.1.ebuild similarity index 96% rename from sys-devel/make/make-4.2.1-r1.ebuild rename to sys-devel/make/make-4.2.1.ebuild index 17448b34b98..70e90b6bf62 100644 --- a/sys-devel/make/make-4.2.1-r1.ebuild +++ b/sys-devel/make/make-4.2.1.ebuild @@ -22,7 +22,6 @@ RDEPEND="${CDEPEND} PATCHES=( "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch - "${FILESDIR}"/${PN}-4.2-default-cxx.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/
commit: bace4a893fbf789675d576be2a291aef33db90f5 Author: Lei Zhang gmail com> AuthorDate: Wed Jul 27 21:36:35 2016 + Commit: Michał Górny gentoo org> CommitDate: Fri Apr 14 15:34:25 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bace4a89 sys-devel/make: default CXX to c++ instead of g++, #589894 Closes: https://github.com/gentoo/gentoo/pull/1982 Package-Manager: portage-2.2.28 Reviewed-by: Anthony G. Basile gentoo.org> sys-devel/make/files/make-4.2-default-cxx.patch| 13 + sys-devel/make/{make-4.2.1.ebuild => make-4.2.1-r1.ebuild} | 1 + 2 files changed, 14 insertions(+) diff --git a/sys-devel/make/files/make-4.2-default-cxx.patch b/sys-devel/make/files/make-4.2-default-cxx.patch new file mode 100644 index 000..4d592086a6f --- /dev/null +++ b/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/sys-devel/make/make-4.2.1.ebuild b/sys-devel/make/make-4.2.1-r1.ebuild similarity index 96% rename from sys-devel/make/make-4.2.1.ebuild rename to sys-devel/make/make-4.2.1-r1.ebuild index 70e90b6bf62..17448b34b98 100644 --- a/sys-devel/make/make-4.2.1.ebuild +++ b/sys-devel/make/make-4.2.1-r1.ebuild @@ -22,6 +22,7 @@ RDEPEND="${CDEPEND} PATCHES=( "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch + "${FILESDIR}"/${PN}-4.2-default-cxx.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 39f283c90ebd42ae51604ede6baf4218b0c24ad3 Author: Markus Meier gentoo org> AuthorDate: Sat Feb 25 07:41:49 2017 + Commit: Markus Meier gentoo org> CommitDate: Sat Feb 25 07:41:49 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39f283c9 sys-devel/make: arm stable, bug #606834 Package-Manager: Portage-2.3.3, Repoman-2.3.1 RepoMan-Options: --include-arches="arm" sys-devel/make/make-4.2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.2.1.ebuild b/sys-devel/make/make-4.2.1.ebuild index 748d4c3685..bbaba72cf6 100644 --- a/sys-devel/make/make-4.2.1.ebuild +++ b/sys-devel/make/make-4.2.1.ebuild @@ -12,7 +12,7 @@ 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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:= )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: f344d5efa58531eb9cdaf6e7688203bf18c65e57 Author: Michael Haubenwallner gentoo org> AuthorDate: Mon Feb 20 12:55:26 2017 + Commit: Michael Haubenwallner gentoo org> CommitDate: Mon Feb 20 14:10:27 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f344d5ef sys-devel/make: keyword ~x64-cygwin Package-Manager: portage-2.3.3 sys-devel/make/make-4.2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.2.1.ebuild b/sys-devel/make/make-4.2.1.ebuild index e801079365..748d4c3685 100644 --- a/sys-devel/make/make-4.2.1.ebuild +++ b/sys-devel/make/make-4.2.1.ebuild @@ -12,7 +12,7 @@ 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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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:= )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 68991fec955b4279a0bb329ccc3b769524aa8268 Author: Jeroen Roovers gentoo org> AuthorDate: Sun Jan 29 20:43:11 2017 + Commit: Jeroen Roovers gentoo org> CommitDate: Sun Jan 29 20:43:11 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68991fec sys-devel/make: Stable for HPPA (bug #606834). Package-Manager: Portage-2.3.3, Repoman-2.3.1 RepoMan-Options: --ignore-arches sys-devel/make/make-4.2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.2.1.ebuild b/sys-devel/make/make-4.2.1.ebuild index bd593bd..e801079 100644 --- a/sys-devel/make/make-4.2.1.ebuild +++ b/sys-devel/make/make-4.2.1.ebuild @@ -12,7 +12,7 @@ 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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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:= )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: fb38cb4ec08ce66b8f489678c4eef2979ce7e481 Author: Fabian Groffen gentoo org> AuthorDate: Sun Jan 29 20:07:15 2017 + Commit: Fabian Groffen gentoo org> CommitDate: Sun Jan 29 20:13:57 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb38cb4e sys-devel/make: dropped ~hppa-hpux ~ia64-hpux ~ia64-linux ~x64-freebsd ~x86-freebsd ~x86-interix Package-Manager: portage-2.3.3 sys-devel/make/make-3.82-r4.ebuild | 4 ++-- sys-devel/make/make-4.0-r1.ebuild | 4 ++-- sys-devel/make/make-4.1-r1.ebuild | 4 ++-- sys-devel/make/make-4.2.1.ebuild | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys-devel/make/make-3.82-r4.ebuild b/sys-devel/make/make-3.82-r4.ebuild index bb0b7c5..7dbd31e 100644 --- a/sys-devel/make/make-3.82-r4.ebuild +++ b/sys-devel/make/make-3.82-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -12,7 +12,7 @@ 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" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 )" diff --git a/sys-devel/make/make-4.0-r1.ebuild b/sys-devel/make/make-4.0-r1.ebuild index 6e20912..7aaa789 100644 --- a/sys-devel/make/make-4.0-r1.ebuild +++ b/sys-devel/make/make-4.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -12,7 +12,7 @@ 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" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 )" diff --git a/sys-devel/make/make-4.1-r1.ebuild b/sys-devel/make/make-4.1-r1.ebuild index 939e6ee..2ba1577 100644 --- a/sys-devel/make/make-4.1-r1.ebuild +++ b/sys-devel/make/make-4.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -12,7 +12,7 @@ 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" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 )" diff --git a/sys-devel/make/make-4.2.1.ebuild b/sys-devel/make/make-4.2.1.ebuild index 12ade0c..bd593bd 100644 --- a/sys-devel/make/make-4.2.1.ebuild +++ b/sys-devel/make/make-4.2.1.ebuild @@ -12,7 +12,7 @@ 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" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="guile nls static"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 1da697cde6837c4f8670a147520096a74a086c7e Author: Agostino Sarubbo gentoo org> AuthorDate: Thu Jan 26 11:00:09 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu Jan 26 11:00:42 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1da697cd sys-devel/make: ppc stable wrt bug #606834 Package-Manager: portage-2.3.0 RepoMan-Options: --include-arches="ppc" Signed-off-by: Agostino Sarubbo gentoo.org> sys-devel/make/make-4.2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.2.1.ebuild b/sys-devel/make/make-4.2.1.ebuild index 3c522fe..12ade0c 100644 --- a/sys-devel/make/make-4.2.1.ebuild +++ b/sys-devel/make/make-4.2.1.ebuild @@ -12,7 +12,7 @@ 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" +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:= )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 970067e8fe2b9722c0eeadf0efad8a23c827557b Author: Tobias Klausmann gentoo org> AuthorDate: Wed Jan 25 13:52:19 2017 + Commit: Tobias Klausmann gentoo org> CommitDate: Wed Jan 25 13:52:19 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=970067e8 sys-devel/make-4.2.1-r0: stable on alpha Gentoo-Bug: 606834 sys-devel/make/make-4.2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.2.1.ebuild b/sys-devel/make/make-4.2.1.ebuild index a8cf12e..a62bdd8 100644 --- a/sys-devel/make/make-4.2.1.ebuild +++ b/sys-devel/make/make-4.2.1.ebuild @@ -12,7 +12,7 @@ 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" +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:= )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 116e61374d230d3ebf21185a7f4f6d746d20fd46 Author: Agostino Sarubbo gentoo org> AuthorDate: Tue Jan 24 11:46:22 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Tue Jan 24 11:46:22 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=116e6137 sys-devel/make: ppc64 stable wrt bug #606834 Package-Manager: portage-2.3.0 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Agostino Sarubbo gentoo.org> sys-devel/make/make-4.2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.2.1.ebuild b/sys-devel/make/make-4.2.1.ebuild index d66147d..a8cf12e 100644 --- a/sys-devel/make/make-4.2.1.ebuild +++ b/sys-devel/make/make-4.2.1.ebuild @@ -12,7 +12,7 @@ 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" +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:= )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 8a188bc01d98937e90630781ab74044cd9a2cbc4 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Jan 23 16:26:14 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Jan 23 16:27:16 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a188bc0 sys-devel/make: ia64 stable wrt bug #606834 Package-Manager: portage-2.3.0 RepoMan-Options: --include-arches="ia64" Signed-off-by: Agostino Sarubbo gentoo.org> sys-devel/make/make-4.2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.2.1.ebuild b/sys-devel/make/make-4.2.1.ebuild index d6e0897..d66147d 100644 --- a/sys-devel/make/make-4.2.1.ebuild +++ b/sys-devel/make/make-4.2.1.ebuild @@ -12,7 +12,7 @@ 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" +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:= )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 633a0ce2c103f0b9c23ef8004fec3d638d2d3efc Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Jan 23 15:44:29 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Jan 23 15:44:29 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=633a0ce2 sys-devel/make: x86 stable wrt bug #606834 Package-Manager: portage-2.3.0 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> sys-devel/make/make-4.2.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/make/make-4.2.1.ebuild b/sys-devel/make/make-4.2.1.ebuild index 75668ea..d6e0897 100644 --- a/sys-devel/make/make-4.2.1.ebuild +++ b/sys-devel/make/make-4.2.1.ebuild @@ -12,7 +12,7 @@ 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" +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:= )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 88f576512d153678a596a655f0a2a53f2ddbabac Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Jan 23 13:49:03 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Jan 23 13:50:58 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88f57651 sys-devel/make: amd64 stable wrt bug #606834 Package-Manager: portage-2.3.0 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> sys-devel/make/make-4.2.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/make/make-4.2.1.ebuild b/sys-devel/make/make-4.2.1.ebuild index c57efde..75668ea 100644 --- a/sys-devel/make/make-4.2.1.ebuild +++ b/sys-devel/make/make-4.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -12,7 +12,7 @@ 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" +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:= )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/files/, sys-devel/make/
commit: b56eacb2a3ccc1677df08b44219344754e140528 Author: Lars Wendler gentoo org> AuthorDate: Sun Jan 22 18:22:04 2017 + Commit: Lars Wendler gentoo org> CommitDate: Sun Jan 22 18:22:04 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b56eacb2 sys-devel/make: Removed old. Package-Manager: Portage-2.3.3, Repoman-2.3.1 sys-devel/make/Manifest| 1 - .../make/files/make-4.2-double_colon_targets.patch | 164 - .../make-4.2-reset_stack_limit_for_re-exec.patch | 25 sys-devel/make/make-4.2-r2.ebuild | 51 --- 4 files changed, 241 deletions(-) diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest index b29c5e3..7e2d565 100644 --- a/sys-devel/make/Manifest +++ b/sys-devel/make/Manifest @@ -4,4 +4,3 @@ DIST make-3.82.tar.bz2 1242186 SHA256 e2c1a73f179c40c71e2fe8abf8a8a0688b84995385 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 DIST make-4.2.1.tar.bz2 1407126 SHA256 d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8 WHIRLPOOL 51c953368a4e2f4ec1e99cbd7f1d3e7671c52051ea213fa849ff60de9a695fe69670be92708b794ae8a7326b91a4548d82de7e0be441f073fc1f3329cfc065e0 -DIST make-4.2.tar.bz2 1400539 SHA256 4e5ce3b62fe5d75ff8db92b7f6df91e476d10c3aceebf1639796dc5bfece655f SHA512 2e8668a130dadc9885a67d80032bf5554c6456741153f3224a4f0eb17ac268b22f062f9e4d66aedda4d1c926494c0b493fe5e941fb5d28ead6adbdf2f09d9128 WHIRLPOOL 94da5df56b2a73444e8c5061e5707c1e90882fb54b641389c8281c797164265985048ef77d4404e898309d6bd9612c270d416a205d368b3364326cc66f4cafc3 diff --git a/sys-devel/make/files/make-4.2-double_colon_targets.patch b/sys-devel/make/files/make-4.2-double_colon_targets.patch deleted file mode 100644 index 642bd42.. --- a/sys-devel/make/files/make-4.2-double_colon_targets.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 4762480ae9cb8df4878286411f178d32db14eff0 Mon Sep 17 00:00:00 2001 -From: Paul Smith-Date: Tue, 31 May 2016 06:56:51 + -Subject: [SV 47995] Ensure forced double-colon rules work with -j. - -The fix for SV 44742 had a side-effect that some double-colon targets -were skipped. This happens because the "considered" facility assumed -that all targets would be visited on each walk through the dependency -graph: we used a bit for considered and toggled it on each pass; if -we didn't walk the entire graph on every pass the bit would get out -of sync. The new behavior after SV 44742 might return early without -walking the entire graph. To fix this I changed the considered value -to an integer which is monotonically increasing: it is then never -possible to incorrectly determine that a previous pass through the -graph already considered the current target. - -* filedef.h (struct file): make CONSIDERED an unsigned int. -* main.c (main): No longer need to reset CONSIDERED. -* remake.c (update_goal_chain): increment CONSIDERED rather than -inverting it between 0<->1. -(update_file_1): Reset CONSIDERED to 0 so it's re-considered. -(check_dep): Ditto. -* tests/scripts/features/double_colon: Add a regression test. -diff --git a/filedef.h b/filedef.h -index 507a027..14b4187 100644 a/filedef.h -+++ b/filedef.h -@@ -58,6 +58,8 @@ struct file - FILE_TIMESTAMP last_mtime; /* File's modtime, if already known. */ - FILE_TIMESTAMP mtime_before_update; /* File's modtime before any updating -has been performed. */ -+unsigned int considered;/* equal to 'considered' if file has been -+ considered on current scan of goal chain */ - int command_flags; /* Flags OR'd in for cmds; see commands.h. */ - enum update_status /* Status of the last attempt to update. */ - { -@@ -96,8 +98,6 @@ struct file - unsigned int ignore_vpath:1;/* Nonzero if we threw out VPATH name. */ - unsigned int pat_searched:1;/* Nonzero if we already searched for -pattern-specific variables. */ --unsigned int considered:1; /* equal to 'considered' if file has been --
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 361e4200c99dd111aa07031b23afe81fe3ca19e7 Author: Lars Wendler gentoo org> AuthorDate: Sat Jun 11 09:21:27 2016 + Commit: Lars Wendler gentoo org> CommitDate: Sat Jun 11 09:21:56 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=361e4200 sys-devel/make: Bump to version 4.2.1 Package-Manager: portage-2.2.28 Signed-off-by: Lars Wendler gentoo.org> sys-devel/make/Manifest | 1 + sys-devel/make/make-4.2.1.ebuild | 49 2 files changed, 50 insertions(+) diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest index 2f8afa8..b29c5e3 100644 --- a/sys-devel/make/Manifest +++ b/sys-devel/make/Manifest @@ -3,4 +3,5 @@ DIST make-3.81.tar.bz2 1151445 SHA256 f3e69023771e23908f5d5592954d8271d3d6af0969 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 +DIST make-4.2.1.tar.bz2 1407126 SHA256 d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8 WHIRLPOOL 51c953368a4e2f4ec1e99cbd7f1d3e7671c52051ea213fa849ff60de9a695fe69670be92708b794ae8a7326b91a4548d82de7e0be441f073fc1f3329cfc065e0 DIST make-4.2.tar.bz2 1400539 SHA256 4e5ce3b62fe5d75ff8db92b7f6df91e476d10c3aceebf1639796dc5bfece655f SHA512 2e8668a130dadc9885a67d80032bf5554c6456741153f3224a4f0eb17ac268b22f062f9e4d66aedda4d1c926494c0b493fe5e941fb5d28ead6adbdf2f09d9128 WHIRLPOOL 94da5df56b2a73444e8c5061e5707c1e90882fb54b641389c8281c797164265985048ef77d4404e898309d6bd9612c270d416a205d368b3364326cc66f4cafc3 diff --git a/sys-devel/make/make-4.2.1.ebuild b/sys-devel/make/make-4.2.1.ebuild new file mode 100644 index 000..c57efde --- /dev/null +++ b/sys-devel/make/make-4.2.1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +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 )" + +PATCHES=( + "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch +) + +src_prepare() { + epatch "${PATCHES[@]}" +} + +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 +}
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/
commit: fdc5c9ad82c8360a04730109849235deb839db89 Author: Lars Wendler gentoo org> AuthorDate: Tue May 31 09:06:19 2016 + Commit: Lars Wendler gentoo org> CommitDate: Tue May 31 09:06:43 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdc5c9ad sys-devel/make: Removed old. Package-Manager: portage-2.2.28 Signed-off-by: Lars Wendler gentoo.org> ...x_double_colon_rules_plus_parallel_builds.patch | 139 - sys-devel/make/make-4.2-r1.ebuild | 54 sys-devel/make/make-4.2.ebuild | 49 3 files changed, 242 deletions(-) diff --git a/sys-devel/make/files/make-4.1-fix_double_colon_rules_plus_parallel_builds.patch b/sys-devel/make/files/make-4.1-fix_double_colon_rules_plus_parallel_builds.patch deleted file mode 100644 index af7a9f2..000 --- a/sys-devel/make/files/make-4.1-fix_double_colon_rules_plus_parallel_builds.patch +++ /dev/null @@ -1,139 +0,0 @@ -From 9bb994e8319c2b153cd3d6d61e2c2882895e7c3a Mon Sep 17 00:00:00 2001 -From: Joe Crayne-Date: Sat, 21 May 2016 21:26:00 + -Subject: [SV 44742] Fix double-colon rules plus parallel builds. - -* remake.c (update_file): Don't update double-colon target status -if we're still building targets. -(ftime_t): Don't propagate timestamps for double-colon targets that -we've not examined yet. -* tests/scripts/features/double_colon: Add parallel build tests. - -Copyright-paperwork-exempt: yes -diff --git a/remake.c b/remake.c -index 63ee648..df1a9e0 100644 a/remake.c -+++ b/remake.c -@@ -320,7 +320,7 @@ update_file (struct file *file, unsigned int depth) - && !f->dontcare && f->no_diag)) - { - DBF (DB_VERBOSE, _("Pruning file '%s'.\n")); -- return f->command_state == cs_finished ? f->update_status : 0; -+ return f->command_state == cs_finished ? f->update_status : us_success; - } - } - -@@ -344,12 +344,9 @@ update_file (struct file *file, unsigned int depth) - - if (f->command_state == cs_running - || f->command_state == cs_deps_running) --{ -- /* Don't run the other :: rules for this -- file until this rule is finished. */ -- status = us_success; -- break; --} -+/* Don't run other :: rules for this target until -+ this rule is finished. */ -+return us_success; - - if (new > status) - status = new; -@@ -1274,6 +1271,7 @@ FILE_TIMESTAMP - f_mtime (struct file *file, int search) - { - FILE_TIMESTAMP mtime; -+ int propagate_timestamp; - - /* File's mtime is not known; must get it from the system. */ - -@@ -1450,10 +1448,13 @@ f_mtime (struct file *file, int search) - } - } - -- /* Store the mtime into all the entries for this file. */ -+ /* Store the mtime into all the entries for this file for which it is safe -+ to do so: avoid propagating timestamps to double-colon rules that haven't -+ been examined so they're run or not based on the pre-update timestamp. */ - if (file->double_colon) - file = file->double_colon; - -+ propagate_timestamp = file->updated; - do - { - /* If this file is not implicit but it is intermediate then it was -@@ -1465,7 +1466,8 @@ f_mtime (struct file *file, int search) - && !file->tried_implicit && file->intermediate) - file->intermediate = 0; - -- file->last_mtime = mtime; -+ if (file->updated == propagate_timestamp) -+file->last_mtime = mtime; - file = file->prev; - } - while (file != 0); -diff --git a/tests/scripts/features/double_colon b/tests/scripts/features/double_colon -index 1097775..80ddb31 100644 a/tests/scripts/features/double_colon -+++ b/tests/scripts/features/double_colon -@@ -151,8 +151,7 @@ two'); - - unlink('result','one','two'); - --# TEST 10: check for proper backslash handling --# Savannah bug #33399 -+# TEST 10: SV 33399 : check for proper backslash handling - - run_make_test(' - a\ xb :: ; @echo one -@@ -160,5 +159,47 @@ a\ xb :: ; @echo two - ', - '', "one\ntwo\n"); - -+# Test 11: SV 44742 : All double-colon rules should be run in parallel build. -+ -+run_make_test('result :: 01 -+ @echo update -+ @touch $@ -+result :: 02 -+ @echo update -+ @touch $@ -+result :: 03 -+ @echo update -+ @touch $@ -+result :: 04 -+ @echo update -+ @touch $@ -+result :: 05 -+ @echo update -+ @touch $@ -+01 02 03 04 05: -+ @touch 01 02 03 04 05 -+', -+ '-j10 result', "update\nupdate\nupdate\nupdate\nupdate\n"); -+ -+unlink('result', '01', '02', '03', '04', '05'); -+ -+# Test 12: SV 44742 : Double-colon rules with parallelism -+ -+run_make_test(' -+root: all -+ echo root -+all:: -+ echo all_one -+all:: 3 -+ echo all_two -+%: -+ sleep $* -+', -+ '-rs -j2 1 2 root',
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/files/, sys-devel/make/
commit: ab5370ff4e2346be6fe3f813db7f81ab25487eae Author: Lars Wendler gentoo org> AuthorDate: Tue May 31 09:04:55 2016 + Commit: Lars Wendler gentoo org> CommitDate: Tue May 31 09:06:40 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab5370ff sys-devel/make: Revbump to add upstream fix for bug #583812. Package-Manager: portage-2.2.28 Signed-off-by: Lars Wendler gentoo.org> .../make/files/make-4.2-double_colon_targets.patch | 164 + .../make-4.2-reset_stack_limit_for_re-exec.patch | 25 sys-devel/make/make-4.2-r2.ebuild | 51 +++ 3 files changed, 240 insertions(+) diff --git a/sys-devel/make/files/make-4.2-double_colon_targets.patch b/sys-devel/make/files/make-4.2-double_colon_targets.patch new file mode 100644 index 000..642bd42 --- /dev/null +++ b/sys-devel/make/files/make-4.2-double_colon_targets.patch @@ -0,0 +1,164 @@ +From 4762480ae9cb8df4878286411f178d32db14eff0 Mon Sep 17 00:00:00 2001 +From: Paul Smith+Date: Tue, 31 May 2016 06:56:51 + +Subject: [SV 47995] Ensure forced double-colon rules work with -j. + +The fix for SV 44742 had a side-effect that some double-colon targets +were skipped. This happens because the "considered" facility assumed +that all targets would be visited on each walk through the dependency +graph: we used a bit for considered and toggled it on each pass; if +we didn't walk the entire graph on every pass the bit would get out +of sync. The new behavior after SV 44742 might return early without +walking the entire graph. To fix this I changed the considered value +to an integer which is monotonically increasing: it is then never +possible to incorrectly determine that a previous pass through the +graph already considered the current target. + +* filedef.h (struct file): make CONSIDERED an unsigned int. +* main.c (main): No longer need to reset CONSIDERED. +* remake.c (update_goal_chain): increment CONSIDERED rather than +inverting it between 0<->1. +(update_file_1): Reset CONSIDERED to 0 so it's re-considered. +(check_dep): Ditto. +* tests/scripts/features/double_colon: Add a regression test. +--- +diff --git a/filedef.h b/filedef.h +index 507a027..14b4187 100644 +--- a/filedef.h b/filedef.h +@@ -58,6 +58,8 @@ struct file + FILE_TIMESTAMP last_mtime; /* File's modtime, if already known. */ + FILE_TIMESTAMP mtime_before_update; /* File's modtime before any updating +has been performed. */ ++unsigned int considered;/* equal to 'considered' if file has been ++ considered on current scan of goal chain */ + int command_flags; /* Flags OR'd in for cmds; see commands.h. */ + enum update_status /* Status of the last attempt to update. */ + { +@@ -96,8 +98,6 @@ struct file + unsigned int ignore_vpath:1;/* Nonzero if we threw out VPATH name. */ + unsigned int pat_searched:1;/* Nonzero if we already searched for +pattern-specific variables. */ +-unsigned int considered:1; /* equal to 'considered' if file has been +- considered on current scan of goal chain */ + unsigned int no_diag:1; /* True if the file failed to update and no +diagnostics has been issued (dontcare). */ + }; +diff --git a/main.c b/main.c +index 576f2e9..e606488 100644 +--- a/main.c b/main.c +@@ -2262,10 +2262,6 @@ main (int argc, char **argv, char **envp) + + for (i = 0, d = read_files; d != 0; ++i, d = d->next) + { +-/* Reset the considered flag; we may need to look at the file +- again to print an error. */ +-d->file->considered = 0; +- + if (d->file->updated) + { + /* This makefile was updated. */ +diff --git a/remake.c b/remake.c +index df1a9e0..5d5d67a 100644 +--- a/remake.c b/remake.c +@@ -57,8 +57,9 @@ unsigned int commands_started = 0; + static struct goaldep *goal_list; + static struct dep *goal_dep; + +-/* Current value for pruning the scan of the goal chain (toggle 0/1). */ +-static unsigned int considered; ++/* Current value for pruning the scan of the goal chain. ++ All files start with considered == 0. */ ++static unsigned int considered = 0; + + static enum update_status update_file (struct file *file, unsigned int depth); + static enum update_status update_file_1 (struct file *file, unsigned int depth); +@@ -90,12 +91,12 @@ update_goal_chain (struct goaldep *goaldeps) + + goal_list = rebuilding_makefiles ? goaldeps : NULL; + +- /* All files start with the considered bit 0, so the global value is 1. */ +- considered = 1; +- + #define MTIME(file) (rebuilding_makefiles ? file_mtime_no_search (file) \ + : file_mtime (file)) + ++ /* Start
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/
commit: aca8dbccd491139f8d0f8a6fcb690f7780933cf2 Author: Lars Wendler gentoo org> AuthorDate: Mon May 23 09:07:24 2016 + Commit: Lars Wendler gentoo org> CommitDate: Mon May 23 09:07:38 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aca8dbcc sys-devel/make: Revbump to revert upstream commit for bug #583812 until a real fix is available. Package-Manager: portage-2.2.28 Signed-off-by: Lars Wendler gentoo.org> ...x_double_colon_rules_plus_parallel_builds.patch | 139 + sys-devel/make/make-4.2-r1.ebuild | 54 2 files changed, 193 insertions(+) diff --git a/sys-devel/make/files/make-4.1-fix_double_colon_rules_plus_parallel_builds.patch b/sys-devel/make/files/make-4.1-fix_double_colon_rules_plus_parallel_builds.patch new file mode 100644 index 000..af7a9f2 --- /dev/null +++ b/sys-devel/make/files/make-4.1-fix_double_colon_rules_plus_parallel_builds.patch @@ -0,0 +1,139 @@ +From 9bb994e8319c2b153cd3d6d61e2c2882895e7c3a Mon Sep 17 00:00:00 2001 +From: Joe Crayne+Date: Sat, 21 May 2016 21:26:00 + +Subject: [SV 44742] Fix double-colon rules plus parallel builds. + +* remake.c (update_file): Don't update double-colon target status +if we're still building targets. +(ftime_t): Don't propagate timestamps for double-colon targets that +we've not examined yet. +* tests/scripts/features/double_colon: Add parallel build tests. + +Copyright-paperwork-exempt: yes +--- +diff --git a/remake.c b/remake.c +index 63ee648..df1a9e0 100644 +--- a/remake.c b/remake.c +@@ -320,7 +320,7 @@ update_file (struct file *file, unsigned int depth) + && !f->dontcare && f->no_diag)) + { + DBF (DB_VERBOSE, _("Pruning file '%s'.\n")); +- return f->command_state == cs_finished ? f->update_status : 0; ++ return f->command_state == cs_finished ? f->update_status : us_success; + } + } + +@@ -344,12 +344,9 @@ update_file (struct file *file, unsigned int depth) + + if (f->command_state == cs_running + || f->command_state == cs_deps_running) +-{ +- /* Don't run the other :: rules for this +- file until this rule is finished. */ +- status = us_success; +- break; +-} ++/* Don't run other :: rules for this target until ++ this rule is finished. */ ++return us_success; + + if (new > status) + status = new; +@@ -1274,6 +1271,7 @@ FILE_TIMESTAMP + f_mtime (struct file *file, int search) + { + FILE_TIMESTAMP mtime; ++ int propagate_timestamp; + + /* File's mtime is not known; must get it from the system. */ + +@@ -1450,10 +1448,13 @@ f_mtime (struct file *file, int search) + } + } + +- /* Store the mtime into all the entries for this file. */ ++ /* Store the mtime into all the entries for this file for which it is safe ++ to do so: avoid propagating timestamps to double-colon rules that haven't ++ been examined so they're run or not based on the pre-update timestamp. */ + if (file->double_colon) + file = file->double_colon; + ++ propagate_timestamp = file->updated; + do + { + /* If this file is not implicit but it is intermediate then it was +@@ -1465,7 +1466,8 @@ f_mtime (struct file *file, int search) + && !file->tried_implicit && file->intermediate) + file->intermediate = 0; + +- file->last_mtime = mtime; ++ if (file->updated == propagate_timestamp) ++file->last_mtime = mtime; + file = file->prev; + } + while (file != 0); +diff --git a/tests/scripts/features/double_colon b/tests/scripts/features/double_colon +index 1097775..80ddb31 100644 +--- a/tests/scripts/features/double_colon b/tests/scripts/features/double_colon +@@ -151,8 +151,7 @@ two'); + + unlink('result','one','two'); + +-# TEST 10: check for proper backslash handling +-# Savannah bug #33399 ++# TEST 10: SV 33399 : check for proper backslash handling + + run_make_test(' + a\ xb :: ; @echo one +@@ -160,5 +159,47 @@ a\ xb :: ; @echo two + ', + '', "one\ntwo\n"); + ++# Test 11: SV 44742 : All double-colon rules should be run in parallel build. ++ ++run_make_test('result :: 01 ++ @echo update ++ @touch $@ ++result :: 02 ++ @echo update ++ @touch $@ ++result :: 03 ++ @echo update ++ @touch $@ ++result :: 04 ++ @echo update ++ @touch $@ ++result :: 05 ++ @echo update ++ @touch $@ ++01 02 03 04 05: ++ @touch 01 02 03 04 05 ++', ++ '-j10 result', "update\nupdate\nupdate\nupdate\nupdate\n"); ++ ++unlink('result', '01', '02', '03', '04', '05'); ++ ++# Test 12: SV 44742 : Double-colon rules with parallelism ++ ++run_make_test(' ++root: all ++ echo root ++all:: ++ echo all_one ++all:: 3 ++ echo all_two ++%: ++ sleep $* ++', ++ '-rs -j2 1 2 root',
[gentoo-commits] repo/gentoo:master commit in: sys-devel/make/
commit: 8f9d867ab9b95f98ccab33d5df445d785874787a Author: Lars Wendler gentoo org> AuthorDate: Sun May 22 15:10:26 2016 + Commit: Lars Wendler gentoo org> CommitDate: Sun May 22 15:32:28 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f9d867a sys-devel/make: Bump to version 4.2 Package-Manager: portage-2.2.28 Signed-off-by: Lars Wendler gentoo.org> sys-devel/make/Manifest| 1 + sys-devel/make/make-4.2.ebuild | 49 ++ 2 files changed, 50 insertions(+) diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest index f4c3edc..2f8afa8 100644 --- a/sys-devel/make/Manifest +++ b/sys-devel/make/Manifest @@ -3,3 +3,4 @@ DIST make-3.81.tar.bz2 1151445 SHA256 f3e69023771e23908f5d5592954d8271d3d6af0969 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 +DIST make-4.2.tar.bz2 1400539 SHA256 4e5ce3b62fe5d75ff8db92b7f6df91e476d10c3aceebf1639796dc5bfece655f SHA512 2e8668a130dadc9885a67d80032bf5554c6456741153f3224a4f0eb17ac268b22f062f9e4d66aedda4d1c926494c0b493fe5e941fb5d28ead6adbdf2f09d9128 WHIRLPOOL 94da5df56b2a73444e8c5061e5707c1e90882fb54b641389c8281c797164265985048ef77d4404e898309d6bd9612c270d416a205d368b3364326cc66f4cafc3 diff --git a/sys-devel/make/make-4.2.ebuild b/sys-devel/make/make-4.2.ebuild new file mode 100644 index 000..c57efde --- /dev/null +++ b/sys-devel/make/make-4.2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +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 )" + +PATCHES=( + "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch +) + +src_prepare() { + epatch "${PATCHES[@]}" +} + +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 +}