* [gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/
@ 2016-05-23 9:07 Lars Wendler
0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler @ 2016-05-23 9:07 UTC (permalink / raw
To: gentoo-commits
commit: aca8dbccd491139f8d0f8a6fcb690f7780933cf2
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon May 23 09:07:24 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon May 23 09:07:38 2016 +0000
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 <polynomial-c <AT> 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 0000000..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 <oh.hello.joe@gmail.com>
+Date: Sat, 21 May 2016 21:26:00 +0000
+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', "all_one\nall_two\nroot\n");
++
+ # This tells the test driver that the perl test script executed properly.
+ 1;
++
++### Local Variables:
++### eval: (setq whitespace-action (delq 'auto-cleanup whitespace-action))
++### End:
+--
+cgit v0.9.0.2
diff --git a/sys-devel/make/make-4.2-r1.ebuild b/sys-devel/make/make-4.2-r1.ebuild
new file mode 100644
index 0000000..4f5d2e3
--- /dev/null
+++ b/sys-devel/make/make-4.2-r1.ebuild
@@ -0,0 +1,54 @@
+# 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[@]}"
+
+ # Revert this upstream commit until a real fix is available.
+ # See https://bugs.gentoo.org/583812
+ EPATCH_OPTS="-R" \
+ epatch "${FILESDIR}"/${PN}-4.1-fix_double_colon_rules_plus_parallel_builds.patch
+}
+
+src_configure() {
+ use static && append-ldflags -static
+ econf \
+ --program-prefix=g \
+ $(use_with guile) \
+ $(use_enable nls)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS NEWS README*
+ if [[ ${USERLAND} == "GNU" ]] ; then
+ # we install everywhere as 'gmake' but on GNU systems,
+ # symlink 'make' to 'gmake'
+ dosym gmake /usr/bin/make
+ dosym gmake.1 /usr/share/man/man1/make.1
+ fi
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/
@ 2016-05-31 9:06 Lars Wendler
0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler @ 2016-05-31 9:06 UTC (permalink / raw
To: gentoo-commits
commit: fdc5c9ad82c8360a04730109849235deb839db89
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 09:06:19 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue May 31 09:06:43 2016 +0000
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 <polynomial-c <AT> 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..0000000
--- 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 <oh.hello.joe@gmail.com>
-Date: Sat, 21 May 2016 21:26:00 +0000
-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', "all_one\nall_two\nroot\n");
-+
- # This tells the test driver that the perl test script executed properly.
- 1;
-+
-+### Local Variables:
-+### eval: (setq whitespace-action (delq 'auto-cleanup whitespace-action))
-+### End:
---
-cgit v0.9.0.2
diff --git a/sys-devel/make/make-4.2-r1.ebuild b/sys-devel/make/make-4.2-r1.ebuild
deleted file mode 100644
index 4f5d2e3..0000000
--- a/sys-devel/make/make-4.2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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[@]}"
-
- # Revert this upstream commit until a real fix is available.
- # See https://bugs.gentoo.org/583812
- EPATCH_OPTS="-R" \
- epatch "${FILESDIR}"/${PN}-4.1-fix_double_colon_rules_plus_parallel_builds.patch
-}
-
-src_configure() {
- use static && append-ldflags -static
- econf \
- --program-prefix=g \
- $(use_with guile) \
- $(use_enable nls)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS NEWS README*
- if [[ ${USERLAND} == "GNU" ]] ; then
- # we install everywhere as 'gmake' but on GNU systems,
- # symlink 'make' to 'gmake'
- dosym gmake /usr/bin/make
- dosym gmake.1 /usr/share/man/man1/make.1
- fi
-}
diff --git a/sys-devel/make/make-4.2.ebuild b/sys-devel/make/make-4.2.ebuild
deleted file mode 100644
index c57efde..0000000
--- a/sys-devel/make/make-4.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/
@ 2017-04-14 15:34 Michał Górny
0 siblings, 0 replies; 11+ messages in thread
From: Michał Górny @ 2017-04-14 15:34 UTC (permalink / raw
To: gentoo-commits
commit: bace4a893fbf789675d576be2a291aef33db90f5
Author: Lei Zhang <zhanglei.april <AT> gmail <DOT> com>
AuthorDate: Wed Jul 27 21:36:35 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr 14 15:34:25 2017 +0000
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 <blueness <AT> 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 00000000000..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() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/
@ 2017-04-14 16:28 Michał Górny
0 siblings, 0 replies; 11+ messages in thread
From: Michał Górny @ 2017-04-14 16:28 UTC (permalink / raw
To: gentoo-commits
commit: 41815b5598cad067c07e1c6f09b118e2114a675f
Author: Lei Zhang <zhanglei.april <AT> gmail <DOT> com>
AuthorDate: Wed Jul 27 21:36:35 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr 14 16:27:59 2017 +0000
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 <blueness <AT> 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 00000000000..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 00000000000..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
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/
@ 2018-02-10 23:41 Andreas Hüttel
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Hüttel @ 2018-02-10 23:41 UTC (permalink / raw
To: gentoo-commits
commit: 4d1b735c647c1047434ab052ffb32913784e5f1a
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 10 23:40:44 2018 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Feb 10 23:40:59 2018 +0000
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..00000000000
--- 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 -0000 1.24
-+++ variable.h 25 Oct 2002 21:37:32 -0000
-@@ -107,6 +107,8 @@
- extern char *expand_argument PARAMS ((char *str, char *end));
- extern char *variable_expand_string PARAMS ((char *line, char *string,
- long length));
-+extern void install_variable_buffer PARAMS ((char **bufp, unsigned int *lenp));
-+extern void restore_variable_buffer PARAMS ((char *buf, unsigned int len));
-
- /* function.c */
- extern int handle_function PARAMS ((char **op, char **stringp));
-Index: expand.c
-===================================================================
-RCS file: /cvsroot/make/make/expand.c,v
-retrieving revision 1.33
-diff -u -B -b -r1.33 expand.c
---- expand.c 14 Oct 2002 21:54:04 -0000 1.33
-+++ expand.c 25 Oct 2002 21:37:32 -0000
-@@ -545,3 +545,28 @@
-
- return value;
- }
-+
-+/* Install a new variable_buffer context, returning the current one for
-+ safe-keeping. */
-+
-+void
-+install_variable_buffer (char **bufp, unsigned int *lenp)
-+{
-+ *bufp = variable_buffer;
-+ *lenp = variable_buffer_length;
-+
-+ variable_buffer = 0;
-+ initialize_variable_output ();
-+}
-+
-+/* Restore a previously-saved variable_buffer setting (free the current one).
-+ */
-+
-+void
-+restore_variable_buffer (char *buf, unsigned int len)
-+{
-+ free (variable_buffer);
-+
-+ variable_buffer = buf;
-+ variable_buffer_length = len;
-+}
-Index: function.c
-===================================================================
-RCS file: /cvsroot/make/make/function.c,v
-retrieving revision 1.71
-diff -u -B -b -r1.71 function.c
---- function.c 14 Oct 2002 21:54:04 -0000 1.71
-+++ function.c 25 Oct 2002 21:37:32 -0000
-@@ -1196,7 +1196,17 @@
- static char *
- func_eval (char *o, char **argv, const char *funcname)
- {
-+ char *buf;
-+ unsigned int len;
-+
-+ /* Eval the buffer. Pop the current variable buffer setting so that the
-+ eval'd code can use its own without conflicting. */
-+
-+ install_variable_buffer (&buf, &len);
-+
- eval_buffer (argv[0]);
-+
-+ restore_variable_buffer (buf, len);
-
- return o;
- }
\ No newline at end of file
diff --git a/sys-devel/make/files/make-3.80-conditional-eval.patch b/sys-devel/make/files/make-3.80-conditional-eval.patch
deleted file mode 100644
index f4c1581f316..00000000000
--- a/sys-devel/make/files/make-3.80-conditional-eval.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-Fix from upstream
-
-https://savannah.gnu.org/bugs/index.php?func=detailitem&item_id=1516
-http://bugs.gentoo.org/123317
-
-Index: read.c
-===================================================================
-RCS file: /cvsroot/make/make/read.c,v
-retrieving revision 1.124
-retrieving revision 1.125
-diff -u -p -r1.124 -r1.125
---- read.c 14 Oct 2002 21:54:04 -0000 1.124
-+++ read.c 25 Oct 2002 22:01:47 -0000 1.125
-@@ -272,6 +272,34 @@ read_all_makefiles (char **makefiles)
- return read_makefiles;
- }
- \f
-+/* Install a new conditional and return the previous one. */
-+
-+static struct conditionals *
-+install_conditionals (struct conditionals *new)
-+{
-+ struct conditionals *save = conditionals;
-+
-+ bzero ((char *) new, sizeof (*new));
-+ conditionals = new;
-+
-+ return save;
-+}
-+
-+/* Free the current conditionals and reinstate a saved one. */
-+
-+static void
-+restore_conditionals (struct conditionals *saved)
-+{
-+ /* Free any space allocated by conditional_line. */
-+ if (conditionals->ignoring)
-+ free (conditionals->ignoring);
-+ if (conditionals->seen_else)
-+ free (conditionals->seen_else);
-+
-+ /* Restore state. */
-+ conditionals = saved;
-+}
-+\f
- static int
- eval_makefile (char *filename, int flags)
- {
-@@ -388,6 +416,8 @@ int
- eval_buffer (char *buffer)
- {
- struct ebuffer ebuf;
-+ struct conditionals *saved;
-+ struct conditionals new;
- const struct floc *curfile;
- int r;
-
-@@ -402,8 +432,12 @@ eval_buffer (char *buffer)
- curfile = reading_file;
- reading_file = &ebuf.floc;
-
-+ saved = install_conditionals (&new);
-+
- r = eval (&ebuf, 1);
-
-+ restore_conditionals (saved);
-+
- reading_file = curfile;
-
- return r;
-@@ -412,13 +446,8 @@ eval_buffer (char *buffer)
- \f
- /* Read file FILENAME as a makefile and add its contents to the data base.
-
-- SET_DEFAULT is true if we are allowed to set the default goal.
-+ SET_DEFAULT is true if we are allowed to set the default goal. */
-
-- FILENAME is added to the `read_makefiles' chain.
--
-- Returns 0 if a file was not found or not read.
-- Returns 1 if FILENAME was found and read.
-- Returns 2 if FILENAME was read, and we kept a reference (don't free it). */
-
- static int
- eval (struct ebuffer *ebuf, int set_default)
-@@ -782,9 +811,7 @@ eval (struct ebuffer *ebuf, int set_defa
-
- /* Save the state of conditionals and start
- the included makefile with a clean slate. */
-- save = conditionals;
-- bzero ((char *) &new_conditionals, sizeof new_conditionals);
-- conditionals = &new_conditionals;
-+ save = install_conditionals (&new_conditionals);
-
- /* Record the rules that are waiting so they will determine
- the default goal before those in the included makefile. */
-@@ -810,14 +837,8 @@ eval (struct ebuffer *ebuf, int set_defa
- }
- }
-
-- /* Free any space allocated by conditional_line. */
-- if (conditionals->ignoring)
-- free (conditionals->ignoring);
-- if (conditionals->seen_else)
-- free (conditionals->seen_else);
--
-- /* Restore state. */
-- conditionals = save;
-+ /* Restore conditional state. */
-+ restore_conditionals (save);
-
- goto rule_complete;
- }
-Index: tests/scripts/functions/eval
-===================================================================
-RCS file: /cvsroot/make/make/tests/scripts/functions/eval,v
-retrieving revision 1.1
-retrieving revision 1.2
-diff -u -p -r1.1 -r1.2
---- tests/scripts/functions/eval 8 Jul 2002 02:26:48 -0000 1.1
-+++ tests/scripts/functions/eval 25 Oct 2002 22:01:47 -0000 1.2
-@@ -57,4 +57,35 @@ $answer = "A = A B = B\n";
-
- &compare_output($answer,&get_logfile(1));
-
-+# Test to make sure eval'ing inside conditionals works properly
-+
-+$makefile3 = &get_tmpfile;
-+
-+open(MAKEFILE,"> $makefile3");
-+
-+print MAKEFILE <<'EOF';
-+FOO = foo
-+
-+all:: ; @echo it
-+
-+define Y
-+ all:: ; @echo worked
-+endef
-+
-+ifdef BAR
-+$(eval $(Y))
-+endif
-+
-+EOF
-+
-+close(MAKEFILE);
-+
-+&run_make_with_options($makefile3, "", &get_logfile);
-+$answer = "it\n";
-+&compare_output($answer,&get_logfile(1));
-+
-+&run_make_with_options($makefile3, "BAR=1", &get_logfile);
-+$answer = "it\nworked\n";
-+&compare_output($answer,&get_logfile(1));
-+
- 1;
diff --git a/sys-devel/make/files/make-3.80-parallel-build-failure.patch b/sys-devel/make/files/make-3.80-parallel-build-failure.patch
deleted file mode 100644
index 717e0f3556c..00000000000
--- a/sys-devel/make/files/make-3.80-parallel-build-failure.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-http://lists.gnu.org/archive/html/bug-make/2005-07/msg00050.html
-http://lists.gnu.org/archive/html/bug-make/2005-08/msg00019.html
-http://bugs.gentoo.org/107613
-
-2005-08-07 Paul D. Smith <psmith@gnu.org>
-
- Fix a bug reported by Michael Matz <matz@suse.de>: patch included.
- If make is running in parallel without -k and two jobs die in a
- row, but not too close to each other, then make will quit without
- waiting for the rest of the jobs to die.
-
- * main.c (die): Don't reset err before calling reap_children() the
- second time: we still want it to be in the error condition.
- * job.c (reap_children): Use a static variable, rather than err,
- to control whether or not the error message should be printed.
-
-Index: job.c
-===================================================================
-RCS file: /cvsroot/make/make/job.c,v
-retrieving revision 1.166
-retrieving revision 1.167
-diff -u -p -r1.166 -r1.167
---- job.c 26 Jun 2005 03:31:30 -0000 1.166
-+++ job.c 8 Aug 2005 05:08:00 -0000 1.167
-@@ -475,9 +479,14 @@ reap_children (int block, int err)
-
- if (err && block)
- {
-- /* We might block for a while, so let the user know why. */
-+ static int printed = 0;
-+
-+ /* We might block for a while, so let the user know why.
-+ Only print this message once no matter how many jobs are left. */
- fflush (stdout);
-- error (NILF, _("*** Waiting for unfinished jobs...."));
-+ if (!printed)
-+ error (NILF, _("*** Waiting for unfinished jobs...."));
-+ printed = 1;
- }
-
- /* We have one less dead child to reap. As noted in
-Index: main.c
-===================================================================
-RCS file: /cvsroot/make/make/main.c,v
-retrieving revision 1.210
-retrieving revision 1.211
-diff -u -p -r1.210 -r1.211
---- main.c 12 Jul 2005 04:35:13 -0000 1.210
-+++ main.c 8 Aug 2005 05:08:00 -0000 1.211
-@@ -2990,7 +2996,8 @@ die (int status)
- print_version ();
-
- /* Wait for children to die. */
-- for (err = (status != 0); job_slots_used > 0; err = 0)
-+ err = (status != 0);
-+ while (job_slots_used > 0)
- reap_children (1, err);
-
- /* Let the remote job module clean up its state. */
diff --git a/sys-devel/make/files/make-3.81-jobserver.patch b/sys-devel/make/files/make-3.81-jobserver.patch
deleted file mode 100644
index cd787ca769d..00000000000
--- a/sys-devel/make/files/make-3.81-jobserver.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-related to bug #193258, but this is the final patch that Fedora went with
-
---- make-3.81/main.c 2007-09-24 15:28:34.000000000 +0200
-+++ make-3.81-pm/main.c 2007-09-24 15:32:50.000000000 +0200
-@@ -1669,8 +1669,12 @@ main (int argc, char **argv, char **envp
-
- if (job_slots > 0)
- {
-- close (job_fds[0]);
-- close (job_fds[1]);
-+ if (restarts == 0)
-+ {
-+ close (job_fds[0]);
-+ close (job_fds[1]);
-+ }
-+
- job_fds[0] = job_fds[1] = -1;
- free (jobserver_fds->list);
- free (jobserver_fds);
diff --git a/sys-devel/make/files/make-3.81-long-cmdline.patch b/sys-devel/make/files/make-3.81-long-cmdline.patch
deleted file mode 100644
index 9ceb5e8195e..00000000000
--- a/sys-devel/make/files/make-3.81-long-cmdline.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-http://bugs.gentoo.org/301116
-
-tweaked a little to avoid regenerating autotools
-
-2009-07-29 Ralf Wildenhues <Ralf.Wildenhues <at> gmx.de>
-
- * configure.in: Check for sys/user.h and linux/binfmts.h
- headers.
- * job.c: Include them if available.
- (construct_command_argv_internal): When constructing the command
- line with 'sh -c', use multiple arguments together with eval
- expansion to evade the Linux per-argument length limit
- MAX_ARG_STRLEN if it is defined.
- Problem reported against Automake by Xan Lopez <xan <at> gnome.org>.
-
---- job.c.orig 2010-01-15 18:36:53.000000000 +0200
-+++ job.c 2010-01-15 18:41:09.000000000 +0200
-@@ -29,6 +29,15 @@
-
- #include <string.h>
-
-+#if defined(__linux__) /* defined (HAVE_LINUX_BINFMTS_H) && defined (HAVE_SYS_USER_H) */
-+#include <sys/user.h>
-+#include <unistd.h>
-+#ifndef PAGE_SIZE
-+#define PAGE_SIZE sysconf(_SC_PAGE_SIZE)
-+#endif
-+#include <linux/binfmts.h>
-+#endif
-+
- /* Default shell to use. */
- #ifdef WINDOWS32
- #include <windows.h>
-@@ -2697,9 +2702,19 @@
- #endif
- unsigned int line_len = strlen (line);
-
-+#ifdef MAX_ARG_STRLEN
-+ static char eval_line[] = "eval\\ \\\"set\\ x\\;\\ shift\\;\\ ";
-+#define ARG_NUMBER_DIGITS 5
-+#define EVAL_LEN (sizeof(eval_line)-1 + shell_len + 4 \
-+ + (7 + ARG_NUMBER_DIGITS) * 2 * line_len / (MAX_ARG_STRLEN - 2))
-+#else
-+#define EVAL_LEN 0
-+#endif
- char *new_line = (char *) alloca (shell_len + (sizeof (minus_c) - 1)
-- + (line_len * 2) + 1);
-+ + (line_len*2) + 1 + EVAL_LEN);
-+
- char *command_ptr = NULL; /* used for batch_mode_shell mode */
-+ char *args_ptr;
-
- # ifdef __EMX__ /* is this necessary? */
- if (!unixy_shell)
-@@ -2712,6 +2727,30 @@
- bcopy (minus_c, ap, sizeof (minus_c) - 1);
- ap += sizeof (minus_c) - 1;
- command_ptr = ap;
-+
-+#if !defined (WINDOWS32) && defined (MAX_ARG_STRLEN)
-+ if (unixy_shell && line_len > MAX_ARG_STRLEN)
-+ {
-+ unsigned j;
-+ memcpy (ap, eval_line, sizeof (eval_line) - 1);
-+ ap += sizeof (eval_line) - 1;
-+ for (j = 1; j <= 2 * line_len / (MAX_ARG_STRLEN - 2); j++)
-+ ap += sprintf (ap, "\\$\\{%u\\}", j);
-+ *ap++ = '\\';
-+ *ap++ = '"';
-+ *ap++ = ' ';
-+ /* Copy only the first word of SHELL to $0. */
-+ for (p = shell; *p != '\0'; ++p)
-+ {
-+ if (isspace ((unsigned char)*p))
-+ break;
-+ *ap++ = *p;
-+ }
-+ *ap++ = ' ';
-+ }
-+#endif
-+ args_ptr = ap;
-+
- for (p = line; *p != '\0'; ++p)
- {
- if (restp != NULL && *p == '\n')
-@@ -2760,6 +2799,14 @@
- }
- #endif
- *ap++ = *p;
-+
-+#if !defined (WINDOWS32) && defined (MAX_ARG_STRLEN)
-+ if (unixy_shell && line_len > MAX_ARG_STRLEN && (ap - args_ptr > MAX_ARG_STRLEN - 2))
-+ {
-+ *ap++ = ' ';
-+ args_ptr = ap;
-+ }
-+#endif
- }
- if (ap == new_line + shell_len + sizeof (minus_c) - 1)
- /* Line was empty. */
diff --git a/sys-devel/make/files/make-3.81-tests-lang.patch b/sys-devel/make/files/make-3.81-tests-lang.patch
deleted file mode 100644
index f4e514712a0..00000000000
--- a/sys-devel/make/files/make-3.81-tests-lang.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Fix from upstream for running tests when LC_ALL is set to non-C
-
-http://bugs.gentoo.org/149147
-
-Index: make/tests/run_make_tests.pl
-===================================================================
-RCS file: /cvsroot/make/make/tests/run_make_tests.pl,v
-retrieving revision 1.22
-retrieving revision 1.23
-diff -u -p -r1.22 -r1.23
---- make/tests/run_make_tests.pl 8 Mar 2006 20:15:09 -0000 1.22
-+++ make/tests/run_make_tests.pl 1 Oct 2006 05:38:38 -0000 1.23
-@@ -228,11 +228,6 @@ sub set_more_defaults
- local($string);
- local($index);
-
-- # Make sure we're in the C locale for those systems that support it,
-- # so sorting, etc. is predictable.
-- #
-- $ENV{LANG} = 'C';
--
- # find the type of the port. We do this up front to have a single
- # point of change if it needs to be tweaked.
- #
-Index: make/tests/test_driver.pl
-===================================================================
-RCS file: /cvsroot/make/make/tests/test_driver.pl,v
-retrieving revision 1.19
-retrieving revision 1.20
-diff -u -p -r1.19 -r1.20
---- make/tests/test_driver.pl 10 Mar 2006 02:20:45 -0000 1.19
-+++ make/tests/test_driver.pl 1 Oct 2006 05:38:38 -0000 1.20
-@@ -78,9 +78,9 @@ sub resetENV
- sub toplevel
- {
- # Pull in benign variables from the user's environment
-- #
-+
- foreach (# UNIX-specific things
-- 'TZ', 'LANG', 'TMPDIR', 'HOME', 'USER', 'LOGNAME', 'PATH',
-+ 'TZ', 'TMPDIR', 'HOME', 'USER', 'LOGNAME', 'PATH',
- # Purify things
- 'PURIFYOPTIONS',
- # Windows NT-specific stuff
-@@ -92,6 +92,10 @@ sub toplevel
- $makeENV{$_} = $ENV{$_} if $ENV{$_};
- }
-
-+ # Make sure our compares are not foiled by locale differences
-+
-+ $makeENV{LC_ALL} = 'C';
-+
- # Replace the environment with the new one
- #
- %origENV = %ENV;
diff --git a/sys-devel/make/files/make-3.81-tests-recursion.patch b/sys-devel/make/files/make-3.81-tests-recursion.patch
deleted file mode 100644
index 490e2a912cd..00000000000
--- a/sys-devel/make/files/make-3.81-tests-recursion.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugs.gentoo.org/329153
-https://savannah.gnu.org/bugs/index.php?29968
-
---- tests/scripts/features/recursion 2005/02/10 00:10:58 1.2
-+++ tests/scripts/features/recursion 2010/07/01 07:16:00 1.3
-@@ -16,7 +16,7 @@
- @echo MAKELEVEL = $(MAKELEVEL)
- @echo THE END
- ',
-- ('CFLAGS=-O -w' . ($parallel_jobs ? '-j 2' : '')),
-+ ('CFLAGS=-O -w' . ($parallel_jobs ? ' -j 2' : '')),
- ($vos
- ? "#MAKE#: Entering directory `#PWD#'
- make 'CFLAGS=-O' -f #MAKEFILE# foo
diff --git a/sys-devel/make/files/make-3.82-MAKEFLAGS-reexec.patch b/sys-devel/make/files/make-3.82-MAKEFLAGS-reexec.patch
deleted file mode 100644
index a2f59657d4c..00000000000
--- a/sys-devel/make/files/make-3.82-MAKEFLAGS-reexec.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugs.gentoo.org/331975
-https://savannah.gnu.org/bugs/?30723
-
---- main.c 2010/07/19 07:10:53 1.243
-+++ main.c 2010/08/10 07:35:34 1.244
-@@ -2093,7 +2093,7 @@
- const char *pv = define_makeflags (1, 1);
- char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
- sprintf (p, "MAKEFLAGS=%s", pv);
-- putenv (p);
-+ putenv (allocated_variable_expand (p));
- }
-
- if (ISDB (DB_BASIC))
diff --git a/sys-devel/make/files/make-3.82-archives-many-objs.patch b/sys-devel/make/files/make-3.82-archives-many-objs.patch
deleted file mode 100644
index abdcd322801..00000000000
--- a/sys-devel/make/files/make-3.82-archives-many-objs.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-http://bugs.gentoo.org/334889
-https://savannah.gnu.org/bugs/?30612
-
-revision 1.194
-date: 2010-08-13 22:50:14 -0400; author: psmith; state: Exp; lines: +9 -6; commitid: 4UaslPqQHZTs5wKu;
-- Fix Savannah bug #30612: handling of archive references with >1 object
-
-Index: read.c
-===================================================================
-RCS file: /sources/make/make/read.c,v
-retrieving revision 1.193
-retrieving revision 1.194
-diff -u -p -r1.193 -r1.194
---- read.c 13 Jul 2010 01:20:42 -0000 1.193
-+++ read.c 14 Aug 2010 02:50:14 -0000 1.194
-@@ -3028,7 +3028,7 @@ parse_file_seq (char **stringp, unsigned
- {
- /* This looks like the first element in an open archive group.
- A valid group MUST have ')' as the last character. */
-- const char *e = p + nlen;
-+ const char *e = p;
- do
- {
- e = next_token (e);
-@@ -3084,19 +3084,19 @@ parse_file_seq (char **stringp, unsigned
- Go to the next item in the string. */
- if (flags & PARSEFS_NOGLOB)
- {
-- NEWELT (concat (2, prefix, tp));
-+ NEWELT (concat (2, prefix, tmpbuf));
- continue;
- }
-
- /* If we get here we know we're doing glob expansion.
- TP is a string in tmpbuf. NLEN is no longer used.
- We may need to do more work: after this NAME will be set. */
-- name = tp;
-+ name = tmpbuf;
-
- /* Expand tilde if applicable. */
-- if (tp[0] == '~')
-+ if (tmpbuf[0] == '~')
- {
-- tildep = tilde_expand (tp);
-+ tildep = tilde_expand (tmpbuf);
- if (tildep != 0)
- name = tildep;
- }
-@@ -3152,7 +3152,10 @@ parse_file_seq (char **stringp, unsigned
- else
- {
- /* We got a chain of items. Attach them. */
-- (*newp)->next = found;
-+ if (*newp)
-+ (*newp)->next = found;
-+ else
-+ *newp = found;
-
- /* Find and set the new end. Massage names if necessary. */
- while (1)
diff --git a/sys-devel/make/files/make-3.82-construct-command-line.patch b/sys-devel/make/files/make-3.82-construct-command-line.patch
deleted file mode 100644
index c504c45291b..00000000000
--- a/sys-devel/make/files/make-3.82-construct-command-line.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-https://savannah.gnu.org/bugs/?23922
-
-From 6f3684710a0f832533191f8657a57bc2fbba90ba Mon Sep 17 00:00:00 2001
-From: eliz <eliz>
-Date: Sat, 7 May 2011 08:29:13 +0000
-Subject: [PATCH] job.c (construct_command_argv_internal): Don't assume
- shellflags is always non-NULL. Escape-protect characters
- special to the shell when copying the value of SHELL into
- new_line. Fixes Savannah bug #23922.
-
----
- ChangeLog | 7 +++++++
- job.c | 23 ++++++++++++++++-------
- 2 files changed, 23 insertions(+), 7 deletions(-)
-
-diff --git a/job.c b/job.c
-index 67b402d..c2ce84d 100644
---- a/job.c
-+++ b/job.c
-@@ -2844,12 +2844,12 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
-
- unsigned int shell_len = strlen (shell);
- unsigned int line_len = strlen (line);
-- unsigned int sflags_len = strlen (shellflags);
-+ unsigned int sflags_len = shellflags ? strlen (shellflags) : 0;
- char *command_ptr = NULL; /* used for batch_mode_shell mode */
- char *new_line;
-
- # ifdef __EMX__ /* is this necessary? */
-- if (!unixy_shell)
-+ if (!unixy_shell && shellflags)
- shellflags[0] = '/'; /* "/c" */
- # endif
-
-@@ -2911,19 +2911,28 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
-
- new_argv = xmalloc (4 * sizeof (char *));
- new_argv[0] = xstrdup(shell);
-- new_argv[1] = xstrdup(shellflags);
-+ new_argv[1] = xstrdup(shellflags ? shellflags : "");
- new_argv[2] = line;
- new_argv[3] = NULL;
- return new_argv;
- }
-
-- new_line = alloca (shell_len + 1 + sflags_len + 1
-+ new_line = alloca ((shell_len*2) + 1 + sflags_len + 1
- + (line_len*2) + 1);
- ap = new_line;
-- memcpy (ap, shell, shell_len);
-- ap += shell_len;
-+ /* Copy SHELL, escaping any characters special to the shell. If
-+ we don't escape them, construct_command_argv_internal will
-+ recursively call itself ad nauseam, or until stack overflow,
-+ whichever happens first. */
-+ for (p = shell; *p != '\0'; ++p)
-+ {
-+ if (strchr (sh_chars, *p) != 0)
-+ *(ap++) = '\\';
-+ *(ap++) = *p;
-+ }
- *(ap++) = ' ';
-- memcpy (ap, shellflags, sflags_len);
-+ if (shellflags)
-+ memcpy (ap, shellflags, sflags_len);
- ap += sflags_len;
- *(ap++) = ' ';
- command_ptr = ap;
---
-1.7.12
-
diff --git a/sys-devel/make/files/make-3.82-copy-on-expand.patch b/sys-devel/make/files/make-3.82-copy-on-expand.patch
deleted file mode 100644
index 3f202b4db96..00000000000
--- a/sys-devel/make/files/make-3.82-copy-on-expand.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-fix from upstream cvs
-
-----------------------------
-revision 1.58
-date: 2011-08-29 12:20:19 -0400; author: psmith; state: Exp; lines: +7 -13; commitid: MdH0jSxpuIy7mqxv;
-Save strings we're expanding in case an embedded eval causes them
-to be freed (if they're the value of a variable that's reset for example).
-See Savannah patch #7534
-
-Index: expand.c
-===================================================================
-RCS file: /sources/make/make/expand.c,v
-retrieving revision 1.57
-retrieving revision 1.58
-diff -u -p -r1.57 -r1.58
---- expand.c 7 May 2011 20:03:49 -0000 1.57
-+++ expand.c 29 Aug 2011 16:20:19 -0000 1.58
-@@ -197,7 +197,7 @@ variable_expand_string (char *line, cons
- {
- struct variable *v;
- const char *p, *p1;
-- char *abuf = NULL;
-+ char *save;
- char *o;
- unsigned int line_offset;
-
-@@ -212,16 +212,11 @@ variable_expand_string (char *line, cons
- return (variable_buffer);
- }
-
-- /* If we want a subset of the string, allocate a temporary buffer for it.
-- Most of the functions we use here don't work with length limits. */
-- if (length > 0 && string[length] != '\0')
-- {
-- abuf = xmalloc(length+1);
-- memcpy(abuf, string, length);
-- abuf[length] = '\0';
-- string = abuf;
-- }
-- p = string;
-+ /* We need a copy of STRING: due to eval, it's possible that it will get
-+ freed as we process it (it might be the value of a variable that's reset
-+ for example). Also having a nil-terminated string is handy. */
-+ save = length < 0 ? xstrdup (string) : xstrndup (string, length);
-+ p = save;
-
- while (1)
- {
-@@ -411,8 +406,7 @@ variable_expand_string (char *line, cons
- ++p;
- }
-
-- if (abuf)
-- free (abuf);
-+ free (save);
-
- variable_buffer_output (o, "", 1);
- return (variable_buffer + line_offset);
diff --git a/sys-devel/make/files/make-3.82-glob-speedup.patch b/sys-devel/make/files/make-3.82-glob-speedup.patch
deleted file mode 100644
index c826c2c0e1f..00000000000
--- a/sys-devel/make/files/make-3.82-glob-speedup.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-change from upstream to speed up by skipping unused globs
-https://bugs.gentoo.org/382845
-
-http://cvs.savannah.gnu.org/viewvc/make/read.c?root=make&r1=1.198&r2=1.200
-
-Revision 1.200
-Sat May 7 14:36:12 2011 UTC (4 months, 1 week ago) by psmith
-Branch: MAIN
-Changes since 1.199: +1 -1 lines
-Inverted the boolean test from what I wanted it to be. Added a
-regression test to make sure this continues to work.
-
-Revision 1.199
-Mon May 2 00:18:06 2011 UTC (4 months, 2 weeks ago) by psmith
-Branch: MAIN
-Changes since 1.198: +35 -25 lines
-Avoid invoking glob() unless the filename has potential globbing
-characters in it, for performance improvements.
-
---- a/read.c 2011/04/29 15:27:39 1.198
-+++ b/read.c 2011/05/07 14:36:12 1.200
-@@ -2901,6 +2901,7 @@
- const char *name;
- const char **nlist = 0;
- char *tildep = 0;
-+ int globme = 1;
- #ifndef NO_ARCHIVES
- char *arname = 0;
- char *memname = 0;
-@@ -3109,32 +3110,40 @@
- }
- #endif /* !NO_ARCHIVES */
-
-- switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
-- {
-- case GLOB_NOSPACE:
-- fatal (NILF, _("virtual memory exhausted"));
--
-- case 0:
-- /* Success. */
-- i = gl.gl_pathc;
-- nlist = (const char **)gl.gl_pathv;
-- break;
--
-- case GLOB_NOMATCH:
-- /* If we want only existing items, skip this one. */
-- if (flags & PARSEFS_EXISTS)
-- {
-- i = 0;
-- break;
-- }
-- /* FALLTHROUGH */
--
-- default:
-- /* By default keep this name. */
-+ /* glob() is expensive: don't call it unless we need to. */
-+ if (!(flags & PARSEFS_EXISTS) && strpbrk (name, "?*[") == NULL)
-+ {
-+ globme = 0;
- i = 1;
- nlist = &name;
-- break;
-- }
-+ }
-+ else
-+ switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
-+ {
-+ case GLOB_NOSPACE:
-+ fatal (NILF, _("virtual memory exhausted"));
-+
-+ case 0:
-+ /* Success. */
-+ i = gl.gl_pathc;
-+ nlist = (const char **)gl.gl_pathv;
-+ break;
-+
-+ case GLOB_NOMATCH:
-+ /* If we want only existing items, skip this one. */
-+ if (flags & PARSEFS_EXISTS)
-+ {
-+ i = 0;
-+ break;
-+ }
-+ /* FALLTHROUGH */
-+
-+ default:
-+ /* By default keep this name. */
-+ i = 1;
-+ nlist = &name;
-+ break;
-+ }
-
- /* For each matched element, add it to the list. */
- while (i-- > 0)
-@@ -3174,7 +3183,8 @@
- #endif /* !NO_ARCHIVES */
- NEWELT (concat (2, prefix, nlist[i]));
-
-- globfree (&gl);
-+ if (globme)
-+ globfree (&gl);
-
- #ifndef NO_ARCHIVES
- if (arname)
diff --git a/sys-devel/make/files/make-3.82-intermediate-parallel.patch b/sys-devel/make/files/make-3.82-intermediate-parallel.patch
deleted file mode 100644
index df9b8d475b9..00000000000
--- a/sys-devel/make/files/make-3.82-intermediate-parallel.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://savannah.gnu.org/bugs/?30653
-https://bugs.gentoo.org/431250
-
-From d1ba0ee36b2bdd91434b5df90f0f4cceda7d6979 Mon Sep 17 00:00:00 2001
-From: psmith <psmith>
-Date: Mon, 10 Sep 2012 02:36:05 +0000
-Subject: [PATCH] Force intermediate targets to be considered if their
- non-intermediate parent needs to be remade. Fixes Savannah
- bug #30653.
-
----
- ChangeLog | 4 ++++
- remake.c | 4 ++++
- tests/scripts/features/parallelism | 17 +++++++++++++++++
- 3 files changed, 25 insertions(+)
-
-diff --git a/remake.c b/remake.c
-index c0bf709..b1ddd23 100644
---- a/remake.c
-+++ b/remake.c
-@@ -612,6 +612,10 @@ update_file_1 (struct file *file, unsigned int depth)
- d->file->dontcare = file->dontcare;
- }
-
-+ /* We may have already considered this file, when we didn't know
-+ we'd need to update it. Force update_file() to consider it and
-+ not prune it. */
-+ d->file->considered = !considered;
-
- dep_status |= update_file (d->file, depth);
-
-diff --git a/tests/scripts/features/parallelism b/tests/scripts/features/parallelism
-index d4250f0..76d24a7 100644
---- a/tests/scripts/features/parallelism
-+++ b/tests/scripts/features/parallelism
-@@ -214,6 +214,23 @@ rm main.x");
- rmfiles(qw(foo.y foo.y.in main.bar));
- }
-
-+# Ensure intermediate/secondary files are not pruned incorrectly.
-+# See Savannah bug #30653
-+
-+utouch(-15, 'file2');
-+utouch(-10, 'file4');
-+utouch(-5, 'file1');
-+
-+run_make_test(q!
-+.INTERMEDIATE: file3
-+file4: file3 ; @mv -f $< $@
-+file3: file2 ; touch $@
-+file2: file1 ; @touch $@
-+!,
-+ '--no-print-directory -j2', "touch file3");
-+
-+#rmfiles('file1', 'file2', 'file3', 'file4');
-+
- if ($all_tests) {
- # Jobserver FD handling is messed up in some way.
- # Savannah bug #28189
---
-1.7.12
-
diff --git a/sys-devel/make/files/make-3.82-long-command-line.patch b/sys-devel/make/files/make-3.82-long-command-line.patch
deleted file mode 100644
index 9266786e4da..00000000000
--- a/sys-devel/make/files/make-3.82-long-command-line.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://savannah.gnu.org/bugs/?36451
-
-From a95796de3a491d8acfc8ea94c217b90531161786 Mon Sep 17 00:00:00 2001
-From: psmith <psmith>
-Date: Sun, 9 Sep 2012 23:25:07 +0000
-Subject: [PATCH] Keep the command line on the heap to avoid stack overflow.
- Fixes Savannah bug #36451.
-
----
- ChangeLog | 3 +++
- job.c | 13 +++++++++----
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/job.c b/job.c
-index 754576b..f7b7d51 100644
---- a/job.c
-+++ b/job.c
-@@ -2984,8 +2984,8 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
- return new_argv;
- }
-
-- new_line = alloca ((shell_len*2) + 1 + sflags_len + 1
-- + (line_len*2) + 1);
-+ new_line = xmalloc ((shell_len*2) + 1 + sflags_len + 1
-+ + (line_len*2) + 1);
- ap = new_line;
- /* Copy SHELL, escaping any characters special to the shell. If
- we don't escape them, construct_command_argv_internal will
-@@ -3052,8 +3052,11 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
- *ap++ = *p;
- }
- if (ap == new_line + shell_len + sflags_len + 2)
-- /* Line was empty. */
-- return 0;
-+ {
-+ /* Line was empty. */
-+ free (new_line);
-+ return 0;
-+ }
- *ap = '\0';
-
- #ifdef WINDOWS32
-@@ -3194,6 +3197,8 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
- fatal (NILF, _("%s (line %d) Bad shell context (!unixy && !batch_mode_shell)\n"),
- __FILE__, __LINE__);
- #endif
-+
-+ free (new_line);
- }
- #endif /* ! AMIGA */
-
---
-1.7.12
-
diff --git a/sys-devel/make/files/make-3.82-memory-corruption.patch b/sys-devel/make/files/make-3.82-memory-corruption.patch
deleted file mode 100644
index b28c07353ec..00000000000
--- a/sys-devel/make/files/make-3.82-memory-corruption.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- function.c 2011/04/18 01:25:20 1.121
-+++ function.c 2011/05/02 12:35:01 1.122
-@@ -706,7 +706,7 @@
- const char *word_iterator = argv[0];
- char buf[20];
-
-- while (find_next_token (&word_iterator, (unsigned int *) 0) != 0)
-+ while (find_next_token (&word_iterator, NULL) != 0)
- ++i;
-
- sprintf (buf, "%d", i);
-@@ -1133,21 +1133,14 @@
-
- /* Find the maximum number of words we'll have. */
- t = argv[0];
-- wordi = 1;
-- while (*t != '\0')
-+ wordi = 0;
-+ while ((p = find_next_token (&t, NULL)) != 0)
- {
-- char c = *(t++);
--
-- if (! isspace ((unsigned char)c))
-- continue;
--
-+ ++t;
- ++wordi;
--
-- while (isspace ((unsigned char)*t))
-- ++t;
- }
-
-- words = xmalloc (wordi * sizeof (char *));
-+ words = xmalloc ((wordi == 0 ? 1 : wordi) * sizeof (char *));
-
- /* Now assign pointers to each string in the array. */
- t = argv[0];
diff --git a/sys-devel/make/files/make-3.82-oneshell.patch b/sys-devel/make/files/make-3.82-oneshell.patch
deleted file mode 100644
index fbade127ce6..00000000000
--- a/sys-devel/make/files/make-3.82-oneshell.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-fix from upstream cvs
-
-----------------------------
-revision 1.245
-date: 2010-08-13 22:50:14 -0400; author: psmith; state: Exp; lines: +1 -1; commitid: 4UaslPqQHZTs5wKu;
-- Add oneshell to $(.FEATURES) (forgot that!)
-
-Index: main.c
-===================================================================
-RCS file: /sources/make/make/main.c,v
-retrieving revision 1.244
-retrieving revision 1.245
-diff -u -p -r1.244 -r1.245
---- main.c 10 Aug 2010 07:35:34 -0000 1.244
-+++ main.c 14 Aug 2010 02:50:14 -0000 1.245
-@@ -1138,7 +1138,7 @@ main (int argc, char **argv, char **envp
- a macro and some compilers (MSVC) don't like conditionals in macros. */
- {
- const char *features = "target-specific order-only second-expansion"
-- " else-if shortest-stem undefine"
-+ " else-if shortest-stem undefine oneshell"
- #ifndef NO_ARCHIVES
- " archives"
- #endif
diff --git a/sys-devel/make/files/make-3.82-parallel-remake.patch b/sys-devel/make/files/make-3.82-parallel-remake.patch
deleted file mode 100644
index a19fe7b7d62..00000000000
--- a/sys-devel/make/files/make-3.82-parallel-remake.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-fix from upstream cvs
-
-----------------------------
-revision 1.247
-date: 2011-09-18 19:39:26 -0400; author: psmith; state: Exp; lines: +5 -3; commitid: 07NxO4T5PiWC82Av;
-When we re-exec the master makefile in a jobserver environment, ensure
-that MAKEFLAGS is set properly so the re-exec'd make runs in parallel.
-See Savannah bug #33873.
-
-Index: main.c
-===================================================================
-RCS file: /sources/make/make/main.c,v
-retrieving revision 1.246
-retrieving revision 1.247
-diff -u -p -r1.246 -r1.247
---- main.c 29 Aug 2010 23:05:27 -0000 1.246
-+++ main.c 18 Sep 2011 23:39:26 -0000 1.247
-@@ -2089,6 +2089,11 @@ main (int argc, char **argv, char **envp
-
- ++restarts;
-
-+ /* If we're re-exec'ing the first make, put back the number of
-+ job slots so define_makefiles() will get it right. */
-+ if (master_job_slots)
-+ job_slots = master_job_slots;
-+
- /* Reset makeflags in case they were changed. */
- {
- const char *pv = define_makeflags (1, 1);
-@@ -2825,9 +2830,6 @@ define_makeflags (int all, int makefile)
- && (*(unsigned int *) cs->value_ptr ==
- *(unsigned int *) cs->noarg_value))
- ADD_FLAG ("", 0); /* Optional value omitted; see below. */
-- else if (cs->c == 'j')
-- /* Special case for `-j'. */
-- ADD_FLAG ("1", 1);
- else
- {
- char *buf = alloca (30);
diff --git a/sys-devel/make/make-3.80-r4.ebuild b/sys-devel/make/make-3.80-r4.ebuild
deleted file mode 100644
index 91a6ec2b73d..00000000000
--- a/sys-devel/make/make-3.80-r4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Standard tool to compile source trees"
-HOMEPAGE="https://www.gnu.org/software/make/make.html"
-SRC_URI="mirror://gnu//make/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls static"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND=""
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PV}-memory.patch
- epatch "${FILESDIR}"/${P}-parallel-build-failure.patch
- epatch "${FILESDIR}"/${P}-conditional-eval.patch #123317
-}
-
-src_compile() {
- use static && append-ldflags -static
- econf \
- $(use_enable nls) \
- --program-prefix=g \
- || die
- emake || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc AUTHORS ChangeLog NEWS README*
- if [[ ${USERLAND} == "GNU" ]] ; then
- dosym gmake /usr/bin/make
- dosym gmake.1 /usr/share/man/man1/make.1
- fi
-}
diff --git a/sys-devel/make/make-3.81-r2.ebuild b/sys-devel/make/make-3.81-r2.ebuild
deleted file mode 100644
index 591e437df37..00000000000
--- a/sys-devel/make/make-3.81-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Standard tool to compile source trees"
-HOMEPAGE="https://www.gnu.org/software/make/make.html"
-SRC_URI="mirror://gnu//make/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls static"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="nls? ( virtual/libintl )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-tests-lang.patch
- epatch "${FILESDIR}"/${P}-long-cmdline.patch #301116
- epatch "${FILESDIR}"/${P}-tests-recursion.patch #329153
- epatch "${FILESDIR}"/${P}-jobserver.patch #193258
-}
-
-src_compile() {
- use static && append-ldflags -static
- econf \
- $(use_enable nls) \
- --program-prefix=g \
- || die
- emake || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc AUTHORS ChangeLog NEWS README*
- if [[ ${USERLAND} == "GNU" ]] ; then
- # we install everywhere as 'gmake' but on GNU systems,
- # symlink 'make' to 'gmake'
- dosym gmake /usr/bin/make
- dosym gmake.1 /usr/share/man/man1/make.1
- fi
-}
diff --git a/sys-devel/make/make-3.82-r4.ebuild b/sys-devel/make/make-3.82-r4.ebuild
deleted file mode 100644
index 29a60321b85..00000000000
--- a/sys-devel/make/make-3.82-r4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Standard tool to compile source trees"
-HOMEPAGE="https://www.gnu.org/software/make/make.html"
-SRC_URI="mirror://gnu//make/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~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 )"
-RDEPEND="nls? ( virtual/libintl )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-archives-many-objs.patch #334889
- epatch "${FILESDIR}"/${P}-MAKEFLAGS-reexec.patch #31975
- epatch "${FILESDIR}"/${P}-memory-corruption.patch #355907
- epatch "${FILESDIR}"/${P}-glob-speedup.patch #382845
- epatch "${FILESDIR}"/${P}-copy-on-expand.patch
- epatch "${FILESDIR}"/${P}-oneshell.patch
- epatch "${FILESDIR}"/${P}-parallel-remake.patch
- epatch "${FILESDIR}"/${P}-intermediate-parallel.patch #431250
- epatch "${FILESDIR}"/${P}-construct-command-line.patch
- epatch "${FILESDIR}"/${P}-long-command-line.patch
- epatch "${FILESDIR}"/${P}-darwin-library_search-dylib.patch
-}
-
-src_configure() {
- use static && append-ldflags -static
- econf \
- --program-prefix=g \
- $(use_enable nls)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NEWS README*
- if [[ ${USERLAND} == "GNU" ]] ; then
- # we install everywhere as 'gmake' but on GNU systems,
- # symlink 'make' to 'gmake'
- dosym gmake /usr/bin/make
- dosym gmake.1 /usr/share/man/man1/make.1
- fi
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/
@ 2018-02-19 8:46 Lars Wendler
0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler @ 2018-02-19 8:46 UTC (permalink / raw
To: gentoo-commits
commit: ab1aff5e6534f82e523cd191cca8230f83c21024
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 08:45:30 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 08:45:57 2018 +0000
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 <psmith@gnu.org>
-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.000000000 +0200
++++ make-4.2.1/configure 2016-06-11 01:03:21.000000000 +0200
+@@ -11481,10 +11481,9 @@
+ #include <glob.h>
+ #include <fnmatch.h>
+
+-#define GLOB_INTERFACE_VERSION 1
+ #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
+ # include <gnu-versions.h>
+-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
++# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2
+ gnu glob
+ # endif
+ #endif
+--- make-4.2.1/configure.ac 2016-06-06 14:27:31.000000000 +0200
++++ make-4.2.1/configure.ac 2016-06-06 14:27:31.000000000 +0200
+@@ -399,10 +399,9 @@
#include <glob.h>
#include <fnmatch.h>
@@ -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() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/
@ 2018-03-16 8:47 Lars Wendler
0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler @ 2018-03-16 8:47 UTC (permalink / raw
To: gentoo-commits
commit: d7d3d41c716b3081822fd5cc9d0e05e7657f7735
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 08:31:04 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 08:31:04 2018 +0000
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..00000000000
--- 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 <psmith@gnu.org>
-Date: Sat, 26 Oct 2013 04:10:17 +0000
-Subject: * makeint.h (STOP_SET): [SV 40371] Cast to unsigned char.
-
-* tests/scripts/misc/utf8: Test variable names with characters >127.
-Fix suggested by Robert Bogomip <bob.bogo@milohedge.com>
----
-diff --git a/makeint.h b/makeint.h
-index 77f51e0..c591427 100644
---- a/makeint.h
-+++ b/makeint.h
-@@ -415,7 +415,7 @@ extern int unixy_shell;
- # define MAP_VMSCOMMA 0x0000
- #endif
-
--#define STOP_SET(_v,_m) ANY_SET (stopchar_map[(int)(_v)],(_m))
-+#define STOP_SET(_v,_m) ANY_SET (stopchar_map[(unsigned char)(_v)],(_m))
-
- #if defined(HAVE_SYS_RESOURCE_H) && defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT)
- # define SET_STACK_SIZE
-diff --git a/tests/scripts/misc/utf8 b/tests/scripts/misc/utf8
-new file mode 100644
-index 0000000..2adcd07
---- a/dev/null
-+++ b/tests/scripts/misc/utf8
-@@ -0,0 +1,14 @@
-+# -*-perl-*-
-+$description = "Test utf8 handling.";
-+
-+$details = "";
-+
-+# Variable names containing UTF8 characters
-+run_make_test("
-+\xe2\x96\xaa := hello
-+\$(info \$(\xe2\x96\xaa))
-+all:
-+",
-+ '', "hello\n#MAKE#: Nothing to be done for 'all'.");
-+
-+1;
---
-cgit v0.9.0.2
diff --git a/sys-devel/make/make-4.0-r1.ebuild b/sys-devel/make/make-4.0-r1.ebuild
deleted file mode 100644
index 57aea69cf2c..00000000000
--- 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 'make' to 'gmake'
- dosym gmake /usr/bin/make
- dosym gmake.1 /usr/share/man/man1/make.1
- fi
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/
@ 2018-03-16 8:47 Lars Wendler
0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler @ 2018-03-16 8:47 UTC (permalink / raw
To: gentoo-commits
commit: 5afc3c3f86bba087cd1542759f21a0d5814bebd6
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 08:47:10 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 08:47:10 2018 +0000
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 <heroxbd <AT> 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 00000000000..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.000000000 +0200
++++ make-4.2.1/configure 2016-06-11 01:03:21.000000000 +0200
+@@ -9694,6 +9694,15 @@
+
+ # See if the user wants to add (or not) GNU Guile support
+
++# Check whether --with-guile was given.
++if test "${with_guile+set}" = set; then :
++ withval=$with_guile;
++fi
++
++
++# Annoyingly, each version of Guile comes with it's own PC file so we have to
++# specify them as individual packages. Ugh.
++
+
+
+
+@@ -9814,75 +9823,25 @@
+ fi
+ fi
+
+-# Check whether --with-guile was given.
+-if test "${with_guile+set}" = set; then :
+- withval=$with_guile;
+-fi
+-
+-
+-# For some strange reason, at least on Ubuntu, each version of Guile
+-# comes with it's own PC file so we have to specify them as individual
+-# packages. Ugh.
+ if test "x$with_guile" != xno; then :
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUILE" >&5
+-$as_echo_n "checking for GUILE... " >&6; }
+-
+-if test -n "$GUILE_CFLAGS"; then
+- pkg_cv_GUILE_CFLAGS="$GUILE_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.0\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "guile-2.0") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-2.0" 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-if test -n "$GUILE_LIBS"; then
+- pkg_cv_GUILE_LIBS="$GUILE_LIBS"
+- elif test -n "$PKG_CONFIG"; then
++ guile_versions="2.2 2.0 1.8"
++ guile_version=no
++ have_guile=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU Guile" >&5
++$as_echo_n "checking for GNU Guile... " >&6; }
++ for v in $guile_versions; do
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.0\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "guile-2.0") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-\$v\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "guile-$v") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-2.0" 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
++ guile_version=$v; have_guile=yes; break
+ fi
+- else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-2.0" 2>&1`
+- else
+- GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-2.0" 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$GUILE_PKG_ERRORS" >&5
+-
++ done
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $guile_version" >&5
++$as_echo "$guile_version" >&6; }
++ if test "$have_guile" = yes; then
+
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUILE" >&5
+@@ -9892,12 +9851,12 @@
+ pkg_cv_GUILE_CFLAGS="$GUILE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-1.8\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "guile-1.8") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-\$guile_version\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "guile-$guile_version") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-1.8" 2>/dev/null`
++ pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-$guile_version" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+@@ -9909,12 +9868,12 @@
+ pkg_cv_GUILE_LIBS="$GUILE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-1.8\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "guile-1.8") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-\$guile_version\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "guile-$guile_version") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-1.8" 2>/dev/null`
++ pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-$guile_version" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+@@ -9935,113 +9894,50 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-1.8" 2>&1`
++ GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-$guile_version" 2>&1`
+ else
+- GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-1.8" 2>&1`
++ GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-$guile_version" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GUILE_PKG_ERRORS" >&5
+
+- have_guile=no
+-elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- have_guile=no
+-else
+- GUILE_CFLAGS=$pkg_cv_GUILE_CFLAGS
+- GUILE_LIBS=$pkg_cv_GUILE_LIBS
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+- have_guile=yes
+-fi
+-elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
++ as_fn_error $? "Package requirements (guile-$guile_version) were not met:
+
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUILE" >&5
+-$as_echo_n "checking for GUILE... " >&6; }
++$GUILE_PKG_ERRORS
+
+-if test -n "$GUILE_CFLAGS"; then
+- pkg_cv_GUILE_CFLAGS="$GUILE_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-1.8\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "guile-1.8") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-1.8" 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-if test -n "$GUILE_LIBS"; then
+- pkg_cv_GUILE_LIBS="$GUILE_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-1.8\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "guile-1.8") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-1.8" 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-1.8" 2>&1`
+- else
+- GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-1.8" 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$GUILE_PKG_ERRORS" >&5
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+
+- have_guile=no
++Alternatively, you may set the environment variables GUILE_CFLAGS
++and GUILE_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- have_guile=no
+-else
+- GUILE_CFLAGS=$pkg_cv_GUILE_CFLAGS
+- GUILE_LIBS=$pkg_cv_GUILE_LIBS
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+- have_guile=yes
+-fi
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables GUILE_CFLAGS
++and GUILE_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details" "$LINENO" 5; }
+ else
+ GUILE_CFLAGS=$pkg_cv_GUILE_CFLAGS
+ GUILE_LIBS=$pkg_cv_GUILE_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- have_guile=yes
+-fi
+
+ fi
+
+-if test "$have_guile" = yes; then :
+-
+ $as_echo "#define HAVE_GUILE 1" >>confdefs.h
+
++ fi
++
+ fi
+
+ if test "$have_guile" = yes; then
+--- make-4.2.1/configure.ac 2016-06-06 14:27:31.000000000 +0200
++++ make-4.2.1/configure.ac 2016-06-06 14:27:31.000000000 +0200
+@@ -160,22 +160,28 @@
+ AC_FUNC_CLOSEDIR_VOID
+
+ # See if the user wants to add (or not) GNU Guile support
+-PKG_PROG_PKG_CONFIG
+ AC_ARG_WITH([guile], [AS_HELP_STRING([--with-guile],
+ [Support GNU Guile for embedded scripting])])
+
+-# For some strange reason, at least on Ubuntu, each version of Guile
+-# comes with it's own PC file so we have to specify them as individual
+-# packages. Ugh.
++# Annoyingly, each version of Guile comes with it's own PC file so we have to
++# specify them as individual packages. Ugh.
++PKG_PROG_PKG_CONFIG
++
+ AS_IF([test "x$with_guile" != xno],
+-[ PKG_CHECK_MODULES([GUILE], [guile-2.0], [have_guile=yes],
+- [PKG_CHECK_MODULES([GUILE], [guile-1.8], [have_guile=yes],
+- [have_guile=no])])
++[ guile_versions="2.2 2.0 1.8"
++ guile_version=no
++ have_guile=no
++ AC_MSG_CHECKING([for GNU Guile])
++ for v in $guile_versions; do
++ PKG_CHECK_EXISTS([guile-$v], [guile_version=$v; have_guile=yes; break], [])
++ done
++ AC_MSG_RESULT([$guile_version])
++ if test "$have_guile" = yes; then
++ PKG_CHECK_MODULES(GUILE, [guile-$guile_version])
++ AC_DEFINE([HAVE_GUILE], [1], [Embed GNU Guile support])
++ fi
+ ])
+
+-AS_IF([test "$have_guile" = yes],
+- [AC_DEFINE([HAVE_GUILE], [1], [Embed GNU Guile support])])
+-
+ AM_CONDITIONAL([HAVE_GUILE], [test "$have_guile" = yes])
+
+ AC_FUNC_GETLOADAVG
diff --git a/sys-devel/make/make-4.2.1-r3.ebuild b/sys-devel/make/make-4.2.1-r3.ebuild
new file mode 100644
index 00000000000..ca1d92161ca
--- /dev/null
+++ b/sys-devel/make/make-4.2.1-r3.ebuild
@@ -0,0 +1,58 @@
+# 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 ~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
+ "${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
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/
@ 2018-08-04 13:51 Thomas Deutschmann
0 siblings, 0 replies; 11+ messages in thread
From: Thomas Deutschmann @ 2018-08-04 13:51 UTC (permalink / raw
To: gentoo-commits
commit: 8ea00fef95af2f301e96691ccda3d845811941ac
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 4 13:49:14 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Aug 4 13:51:41 2018 +0000
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..00000000000
--- 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 <psmith@gnu.org>
-Date: Mon, 20 Oct 2014 05:54:56 +0000
-Subject: * main.c (main): [SV 43434] Handle NULL returns from ttyname().
-
----
-diff --git a/main.c b/main.c
-index b2d169c..0cdb8a8 100644
---- a/main.c
-+++ b/main.c
-@@ -1429,13 +1429,18 @@ main (int argc, char **argv, char **envp)
- #ifdef HAVE_ISATTY
- if (isatty (fileno (stdout)))
- if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMOUT")))
-- define_variable_cname ("MAKE_TERMOUT", TTYNAME (fileno (stdout)),
-- o_default, 0)->export = v_export;
--
-+ {
-+ const char *tty = TTYNAME (fileno (stdout));
-+ define_variable_cname ("MAKE_TERMOUT", tty ? tty : DEFAULT_TTYNAME,
-+ o_default, 0)->export = v_export;
-+ }
- if (isatty (fileno (stderr)))
- if (! lookup_variable (STRING_SIZE_TUPLE ("MAKE_TERMERR")))
-- define_variable_cname ("MAKE_TERMERR", TTYNAME (fileno (stderr)),
-- o_default, 0)->export = v_export;
-+ {
-+ const char *tty = TTYNAME (fileno (stderr));
-+ define_variable_cname ("MAKE_TERMERR", tty ? tty : DEFAULT_TTYNAME,
-+ o_default, 0)->export = v_export;
-+ }
- #endif
-
- /* Reset in case the switches changed our minds. */
-diff --git a/makeint.h b/makeint.h
-index 6223936..2009f41 100644
---- a/makeint.h
-+++ b/makeint.h
-@@ -436,10 +436,11 @@ extern struct rlimit stack_limit;
- /* The number of bytes needed to represent the largest integer as a string. */
- #define INTSTR_LENGTH CSTRLEN ("18446744073709551616")
-
-+#define DEFAULT_TTYNAME "true"
- #ifdef HAVE_TTYNAME
- # define TTYNAME(_f) ttyname (_f)
- #else
--# define TTYNAME(_f) "true"
-+# define TTYNAME(_f) DEFAULT_TTYNAME
- #endif
-
- \f
---
-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..00000000000
--- 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() {
- use static && append-ldflags -static
- econf \
- --program-prefix=g \
- $(use_with guile) \
- $(use_enable nls)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS NEWS README*
- if [[ ${USERLAND} == "GNU" ]] ; then
- # we install everywhere as 'gmake' but on GNU systems,
- # symlink 'make' to 'gmake'
- dosym gmake /usr/bin/make
- dosym gmake.1 /usr/share/man/man1/make.1
- fi
-}
diff --git a/sys-devel/make/make-4.2.1-r2.ebuild b/sys-devel/make/make-4.2.1-r2.ebuild
deleted file mode 100644
index c52a434b513..00000000000
--- a/sys-devel/make/make-4.2.1-r2.ebuild
+++ /dev/null
@@ -1,57 +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 ~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
- "${FILESDIR}"/${PN}-4.2.1-perl526.patch
- "${FILESDIR}"/${PN}-4.2.1-glob-internals.patch
-)
-
-src_prepare() {
- default
- # 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
-}
-
-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.ebuild b/sys-devel/make/make-4.2.1.ebuild
deleted file mode 100644
index 807b071729f..00000000000
--- a/sys-devel/make/make-4.2.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 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 ~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.1-perl526.patch
-)
-
-src_prepare() {
- epatch "${PATCHES[@]}"
- epatch_user
-}
-
-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
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/
@ 2018-08-27 19:48 Thomas Deutschmann
0 siblings, 0 replies; 11+ messages in thread
From: Thomas Deutschmann @ 2018-08-27 19:48 UTC (permalink / raw
To: gentoo-commits
commit: b44bbe136afc2747df3f213467dd930c44454408
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 27 19:48:25 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 27 19:48:25 2018 +0000
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 00000000000..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 <psmith@gnu.org>
+Date: Sat, 3 Jun 2017 16:20:51 -0400
+Subject: [SV 51159] Use a non-blocking read with pselect to avoid hangs.
+
+* posixos.c (set_blocking): Set blocking on a file descriptor.
+(jobserver_setup): Set non-blocking on the jobserver read side.
+(jobserver_parse_auth): Ditto.
+(jobserver_acquire_all): Set blocking to avoid a busy-wait loop.
+(jobserver_acquire): If the non-blocking read() returns without
+taking a token then try again.
+---
+ posixos.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 71 insertions(+), 26 deletions(-)
+
+diff --git a/posixos.c b/posixos.c
+index e642d7f..dbafa51 100644
+--- a/posixos.c
++++ b/posixos.c
+@@ -62,6 +62,24 @@ make_job_rfd (void)
+ #endif
+ }
+
++static void
++set_blocking (int fd, int blocking)
++{
++ // If we're not using pselect() don't change the blocking
++#ifdef HAVE_PSELECT
++ int flags;
++ EINTRLOOP (flags, fcntl (fd, F_GETFL));
++ if (flags >= 0)
++ {
++ int r;
++ flags = blocking ? (flags & ~O_NONBLOCK) : (flags | O_NONBLOCK);
++ EINTRLOOP (r, fcntl (fd, F_SETFL, flags));
++ if (r < 0)
++ pfatal_with_name ("fcntl(O_NONBLOCK)");
++ }
++#endif
++}
++
+ unsigned int
+ jobserver_setup (int slots)
+ {
+@@ -86,6 +104,9 @@ jobserver_setup (int slots)
+ pfatal_with_name (_("init jobserver pipe"));
+ }
+
++ /* When using pselect() we want the read to be non-blocking. */
++ set_blocking (job_fds[0], 0);
++
+ return 1;
+ }
+
+@@ -121,6 +142,9 @@ jobserver_parse_auth (const char *auth)
+ return 0;
+ }
+
++ /* When using pselect() we want the read to be non-blocking. */
++ set_blocking (job_fds[0], 0);
++
+ return 1;
+ }
+
+@@ -169,7 +193,10 @@ jobserver_acquire_all (void)
+ {
+ unsigned int tokens = 0;
+
+- /* Close the write side, so the read() won't hang. */
++ /* Use blocking reads to wait for all outstanding jobs. */
++ set_blocking (job_fds[0], 1);
++
++ /* Close the write side, so the read() won't hang forever. */
+ close (job_fds[1]);
+ job_fds[1] = -1;
+
+@@ -236,18 +263,12 @@ jobserver_pre_acquire (void)
+ unsigned int
+ jobserver_acquire (int timeout)
+ {
+- sigset_t empty;
+- fd_set readfds;
+ struct timespec spec;
+ struct timespec *specp = NULL;
+- int r;
+- char intake;
++ sigset_t empty;
+
+ sigemptyset (&empty);
+
+- FD_ZERO (&readfds);
+- FD_SET (job_fds[0], &readfds);
+-
+ if (timeout)
+ {
+ /* Alarm after one second (is this too granular?) */
+@@ -256,28 +277,52 @@ jobserver_acquire (int timeout)
+ specp = &spec;
+ }
+
+- r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty);
+-
+- if (r == -1)
++ while (1)
+ {
+- /* Better be SIGCHLD. */
+- if (errno != EINTR)
+- pfatal_with_name (_("pselect jobs pipe"));
+- return 0;
+- }
++ fd_set readfds;
++ int r;
++ char intake;
+
+- if (r == 0)
+- /* Timeout. */
+- return 0;
++ FD_ZERO (&readfds);
++ FD_SET (job_fds[0], &readfds);
+
+- /* The read FD is ready: read it! */
+- EINTRLOOP (r, read (job_fds[0], &intake, 1));
+- if (r < 0)
+- pfatal_with_name (_("read jobs pipe"));
++ r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty);
++ if (r < 0)
++ switch (errno)
++ {
++ case EINTR:
++ /* SIGCHLD will show up as an EINTR. */
++ return 0;
++
++ case EBADF:
++ /* Someone closed the jobs pipe.
++ That shouldn't happen but if it does we're done. */
++ O (fatal, NILF, _("job server shut down"));
+
+- /* What does it mean if read() returns 0? It shouldn't happen because only
+- the master make can reap all the tokens and close the write side...?? */
+- return r > 0;
++ default:
++ pfatal_with_name (_("pselect jobs pipe"));
++ }
++
++ if (r == 0)
++ /* Timeout. */
++ return 0;
++
++ /* The read FD is ready: read it! This is non-blocking. */
++ EINTRLOOP (r, read (job_fds[0], &intake, 1));
++
++ if (r < 0)
++ {
++ /* Someone sniped our token! Try again. */
++ if (errno == EAGAIN)
++ continue;
++
++ pfatal_with_name (_("read jobs pipe"));
++ }
++
++ /* read() should never return 0: only the master make can reap all the
++ tokens and close the write side...?? */
++ return r > 0;
++ }
+ }
+
+ #else
+--
+cgit v1.0-41-gc330
+
diff --git a/sys-devel/make/make-4.2.1-r4.ebuild b/sys-devel/make/make-4.2.1-r4.ebuild
new file mode 100644
index 00000000000..fbc399d853b
--- /dev/null
+++ b/sys-devel/make/make-4.2.1-r4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic
+
+DESCRIPTION="Standard tool to compile source trees"
+HOMEPAGE="https://www.gnu.org/software/make/make.html"
+SRC_URI="mirror://gnu//make/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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
+ "${FILESDIR}"/${PN}-4.2.1-perl526.patch
+ "${FILESDIR}"/${PN}-4.2.1-glob-internals.patch
+ "${FILESDIR}"/${PN}-4.2.1-pselect-non-blocking.patch
+)
+
+src_prepare() {
+ default
+ # These patches require special handling as they modify configure.ac
+ # which in turn triggers maintainer-mode when being applied the
+ # usual way.
+ eapply -Z "${FILESDIR}"/${PN}-4.2.1-glob-v2.patch \
+ "${FILESDIR}"/${P}-guile-2.2.patch
+}
+
+src_configure() {
+ use static && append-ldflags -static
+ local myeconfargs=(
+ --program-prefix=g
+ $(use_with guile)
+ $(use_enable nls)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS NEWS README*
+ if [[ ${USERLAND} == "GNU" ]] ; then
+ # we install everywhere as 'gmake' but on GNU systems,
+ # symlink 'make' to 'gmake'
+ dosym gmake /usr/bin/make
+ dosym gmake.1 /usr/share/man/man1/make.1
+ fi
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/
@ 2022-04-29 6:12 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-04-29 6:12 UTC (permalink / raw
To: gentoo-commits
commit: 2f57d1e86732ff5160de52e92584363cc0e256cb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 06:08:10 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 06:12:46 2022 +0000
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 <sam <AT> 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=(
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2022-04-29 6:12 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-16 8:47 [gentoo-commits] repo/gentoo:master commit in: sys-devel/make/, sys-devel/make/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2022-04-29 6:12 Sam James
2018-08-27 19:48 Thomas Deutschmann
2018-08-04 13:51 Thomas Deutschmann
2018-03-16 8:47 Lars Wendler
2018-02-19 8:46 Lars Wendler
2018-02-10 23:41 Andreas Hüttel
2017-04-14 16:28 Michał Górny
2017-04-14 15:34 Michał Górny
2016-05-31 9:06 Lars Wendler
2016-05-23 9:07 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox