* [gentoo-commits] repo/gentoo:master commit in: sys-devel/make/files/, sys-devel/make/
@ 2016-05-31 9:06 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2016-05-31 9:06 UTC (permalink / raw
To: gentoo-commits
commit: ab5370ff4e2346be6fe3f813db7f81ab25487eae
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 09:04:55 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue May 31 09:06:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab5370ff
sys-devel/make: Revbump to add upstream fix for bug #583812.
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../make/files/make-4.2-double_colon_targets.patch | 164 +++++++++++++++++++++
.../make-4.2-reset_stack_limit_for_re-exec.patch | 25 ++++
sys-devel/make/make-4.2-r2.ebuild | 51 +++++++
3 files changed, 240 insertions(+)
diff --git a/sys-devel/make/files/make-4.2-double_colon_targets.patch b/sys-devel/make/files/make-4.2-double_colon_targets.patch
new file mode 100644
index 0000000..642bd42
--- /dev/null
+++ b/sys-devel/make/files/make-4.2-double_colon_targets.patch
@@ -0,0 +1,164 @@
+From 4762480ae9cb8df4878286411f178d32db14eff0 Mon Sep 17 00:00:00 2001
+From: Paul Smith <psmith@gnu.org>
+Date: Tue, 31 May 2016 06:56:51 +0000
+Subject: [SV 47995] Ensure forced double-colon rules work with -j.
+
+The fix for SV 44742 had a side-effect that some double-colon targets
+were skipped. This happens because the "considered" facility assumed
+that all targets would be visited on each walk through the dependency
+graph: we used a bit for considered and toggled it on each pass; if
+we didn't walk the entire graph on every pass the bit would get out
+of sync. The new behavior after SV 44742 might return early without
+walking the entire graph. To fix this I changed the considered value
+to an integer which is monotonically increasing: it is then never
+possible to incorrectly determine that a previous pass through the
+graph already considered the current target.
+
+* filedef.h (struct file): make CONSIDERED an unsigned int.
+* main.c (main): No longer need to reset CONSIDERED.
+* remake.c (update_goal_chain): increment CONSIDERED rather than
+inverting it between 0<->1.
+(update_file_1): Reset CONSIDERED to 0 so it's re-considered.
+(check_dep): Ditto.
+* tests/scripts/features/double_colon: Add a regression test.
+---
+diff --git a/filedef.h b/filedef.h
+index 507a027..14b4187 100644
+--- a/filedef.h
++++ b/filedef.h
+@@ -58,6 +58,8 @@ struct file
+ FILE_TIMESTAMP last_mtime; /* File's modtime, if already known. */
+ FILE_TIMESTAMP mtime_before_update; /* File's modtime before any updating
+ has been performed. */
++ unsigned int considered; /* equal to 'considered' if file has been
++ considered on current scan of goal chain */
+ int command_flags; /* Flags OR'd in for cmds; see commands.h. */
+ enum update_status /* Status of the last attempt to update. */
+ {
+@@ -96,8 +98,6 @@ struct file
+ unsigned int ignore_vpath:1;/* Nonzero if we threw out VPATH name. */
+ unsigned int pat_searched:1;/* Nonzero if we already searched for
+ pattern-specific variables. */
+- unsigned int considered:1; /* equal to 'considered' if file has been
+- considered on current scan of goal chain */
+ unsigned int no_diag:1; /* True if the file failed to update and no
+ diagnostics has been issued (dontcare). */
+ };
+diff --git a/main.c b/main.c
+index 576f2e9..e606488 100644
+--- a/main.c
++++ b/main.c
+@@ -2262,10 +2262,6 @@ main (int argc, char **argv, char **envp)
+
+ for (i = 0, d = read_files; d != 0; ++i, d = d->next)
+ {
+- /* Reset the considered flag; we may need to look at the file
+- again to print an error. */
+- d->file->considered = 0;
+-
+ if (d->file->updated)
+ {
+ /* This makefile was updated. */
+diff --git a/remake.c b/remake.c
+index df1a9e0..5d5d67a 100644
+--- a/remake.c
++++ b/remake.c
+@@ -57,8 +57,9 @@ unsigned int commands_started = 0;
+ static struct goaldep *goal_list;
+ static struct dep *goal_dep;
+
+-/* Current value for pruning the scan of the goal chain (toggle 0/1). */
+-static unsigned int considered;
++/* Current value for pruning the scan of the goal chain.
++ All files start with considered == 0. */
++static unsigned int considered = 0;
+
+ static enum update_status update_file (struct file *file, unsigned int depth);
+ static enum update_status update_file_1 (struct file *file, unsigned int depth);
+@@ -90,12 +91,12 @@ update_goal_chain (struct goaldep *goaldeps)
+
+ goal_list = rebuilding_makefiles ? goaldeps : NULL;
+
+- /* All files start with the considered bit 0, so the global value is 1. */
+- considered = 1;
+-
+ #define MTIME(file) (rebuilding_makefiles ? file_mtime_no_search (file) \
+ : file_mtime (file))
+
++ /* Start a fresh batch of consideration. */
++ ++considered;
++
+ /* Update all the goals until they are all finished. */
+
+ while (goals != 0)
+@@ -247,10 +248,10 @@ update_goal_chain (struct goaldep *goaldeps)
+ }
+ }
+
+- /* If we reached the end of the dependency graph toggle the considered
+- flag for the next pass. */
++ /* If we reached the end of the dependency graph update CONSIDERED
++ for the next pass. */
+ if (g == 0)
+- considered = !considered;
++ ++considered;
+ }
+
+ if (rebuilding_makefiles)
+@@ -615,8 +616,8 @@ update_file_1 (struct file *file, unsigned int depth)
+ break;
+
+ if (!running)
+- /* The prereq is considered changed if the timestamp has changed while
+- it was built, OR it doesn't exist. */
++ /* The prereq is considered changed if the timestamp has changed
++ while it was built, OR it doesn't exist. */
+ d->changed = ((file_mtime (d->file) != mtime)
+ || (mtime == NONEXISTENT_MTIME));
+
+@@ -650,7 +651,7 @@ update_file_1 (struct file *file, unsigned int depth)
+ /* 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;
++ d->file->considered = 0;
+
+ new = update_file (d->file, depth);
+ if (new > dep_status)
+@@ -1087,7 +1088,7 @@ check_dep (struct file *file, unsigned int depth,
+ /* If the target was waiting for a dependency it has to be
+ reconsidered, as that dependency might have finished. */
+ if (file->command_state == cs_deps_running)
+- file->considered = !considered;
++ file->considered = 0;
+
+ set_command_state (file, cs_not_started);
+ }
+diff --git a/tests/scripts/features/double_colon b/tests/scripts/features/double_colon
+index 80ddb31..58f126f 100644
+--- a/tests/scripts/features/double_colon
++++ b/tests/scripts/features/double_colon
+@@ -197,6 +197,21 @@ all:: 3
+ ',
+ '-rs -j2 1 2 root', "all_one\nall_two\nroot\n");
+
++# SV 47995 : Parallel double-colon rules with FORCE
++
++run_make_test('
++all:: ; @echo one
++
++all:: joe ; @echo four
++
++joe: FORCE ; touch joe-is-forced
++
++FORCE:
++',
++ '-j5', "one\ntouch joe-is-forced\nfour\n");
++
++unlink('joe-is-forced');
++
+ # This tells the test driver that the perl test script executed properly.
+ 1;
+
+--
+cgit v0.9.0.2
diff --git a/sys-devel/make/files/make-4.2-reset_stack_limit_for_re-exec.patch b/sys-devel/make/files/make-4.2-reset_stack_limit_for_re-exec.patch
new file mode 100644
index 0000000..3844ff1
--- /dev/null
+++ b/sys-devel/make/files/make-4.2-reset_stack_limit_for_re-exec.patch
@@ -0,0 +1,25 @@
+From a3d8c086d54c112fecfa2b9026a32a14f741f5f5 Mon Sep 17 00:00:00 2001
+From: Jeremy Devenport <jeremy.devenport@gmail.com>
+Date: Tue, 31 May 2016 07:09:24 +0000
+Subject: * main.c (main): [SV 48009] Reset stack limit for make re-exec.
+
+Copyright-paperwork-exempt: yes
+---
+diff --git a/main.c b/main.c
+index e606488..fa8045f 100644
+--- a/main.c
++++ b/main.c
+@@ -2454,6 +2454,11 @@ main (int argc, char **argv, char **envp)
+ exit (WIFEXITED(r) ? WEXITSTATUS(r) : EXIT_FAILURE);
+ }
+ #else
++#ifdef SET_STACK_SIZE
++ /* Reset limits, if necessary. */
++ if (stack_limit.rlim_cur)
++ setrlimit (RLIMIT_STACK, &stack_limit);
++#endif
+ exec_command ((char **)nargv, environ);
+ #endif
+ free (aargv);
+--
+cgit v0.9.0.2
diff --git a/sys-devel/make/make-4.2-r2.ebuild b/sys-devel/make/make-4.2-r2.ebuild
new file mode 100644
index 0000000..11fb619
--- /dev/null
+++ b/sys-devel/make/make-4.2-r2.ebuild
@@ -0,0 +1,51 @@
+# 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
+ "${FILESDIR}"/${PN}-4.2-double_colon_targets.patch
+ "${FILESDIR}"/${PN}-4.2-reset_stack_limit_for_re-exec.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] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/make/files/, sys-devel/make/
@ 2017-01-22 18:22 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2017-01-22 18:22 UTC (permalink / raw
To: gentoo-commits
commit: b56eacb2a3ccc1677df08b44219344754e140528
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 18:22:04 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 18:22:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b56eacb2
sys-devel/make: Removed old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-devel/make/Manifest | 1 -
.../make/files/make-4.2-double_colon_targets.patch | 164 ---------------------
.../make-4.2-reset_stack_limit_for_re-exec.patch | 25 ----
sys-devel/make/make-4.2-r2.ebuild | 51 -------
4 files changed, 241 deletions(-)
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index b29c5e3..7e2d565 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -4,4 +4,3 @@ DIST make-3.82.tar.bz2 1242186 SHA256 e2c1a73f179c40c71e2fe8abf8a8a0688b84995385
DIST make-4.0.tar.bz2 1341927 SHA256 e60686c7afede62cc8c86ad3012cf081ea4887daf9d223ce7115703b2bb2dbdb SHA512 82de265963cd08701491e02a4917cd2097762657257a9508119e5847050d0cb15580c163159463e822860435c5910190677d8e4aba644ba75df2895f26117376 WHIRLPOOL 96984c0493651bf27db3ddd6fadde25678e512d4d134fd7063cc5cd54bff6228543c98463835940e19e1cc79a67e22067c889efd460b355438670a4d42ce0d09
DIST make-4.1.tar.bz2 1327342 SHA256 0bc7613389650ee6a24554b52572a272f7356164fd2c4132b0bcf13123e4fca5 SHA512 3fcaf06660b7a5019937b81ee69fe54cdfe0a24d66286fc5cc6a34fa996d76dfe6fd5bc49ee59b727ae2b24ddca261ada0fdb5873ba2b38dcc63647ad3cdb193 WHIRLPOOL 992ae4e6dc5e82bb4dc1b5c0840fbc519769114e61233c2d1cf9badfd0cf52a618fde290cef6cdc13d6c098aea9a67c414655513acefb1d44b031e14fe43d544
DIST make-4.2.1.tar.bz2 1407126 SHA256 d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8 WHIRLPOOL 51c953368a4e2f4ec1e99cbd7f1d3e7671c52051ea213fa849ff60de9a695fe69670be92708b794ae8a7326b91a4548d82de7e0be441f073fc1f3329cfc065e0
-DIST make-4.2.tar.bz2 1400539 SHA256 4e5ce3b62fe5d75ff8db92b7f6df91e476d10c3aceebf1639796dc5bfece655f SHA512 2e8668a130dadc9885a67d80032bf5554c6456741153f3224a4f0eb17ac268b22f062f9e4d66aedda4d1c926494c0b493fe5e941fb5d28ead6adbdf2f09d9128 WHIRLPOOL 94da5df56b2a73444e8c5061e5707c1e90882fb54b641389c8281c797164265985048ef77d4404e898309d6bd9612c270d416a205d368b3364326cc66f4cafc3
diff --git a/sys-devel/make/files/make-4.2-double_colon_targets.patch b/sys-devel/make/files/make-4.2-double_colon_targets.patch
deleted file mode 100644
index 642bd42..00000000
--- a/sys-devel/make/files/make-4.2-double_colon_targets.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From 4762480ae9cb8df4878286411f178d32db14eff0 Mon Sep 17 00:00:00 2001
-From: Paul Smith <psmith@gnu.org>
-Date: Tue, 31 May 2016 06:56:51 +0000
-Subject: [SV 47995] Ensure forced double-colon rules work with -j.
-
-The fix for SV 44742 had a side-effect that some double-colon targets
-were skipped. This happens because the "considered" facility assumed
-that all targets would be visited on each walk through the dependency
-graph: we used a bit for considered and toggled it on each pass; if
-we didn't walk the entire graph on every pass the bit would get out
-of sync. The new behavior after SV 44742 might return early without
-walking the entire graph. To fix this I changed the considered value
-to an integer which is monotonically increasing: it is then never
-possible to incorrectly determine that a previous pass through the
-graph already considered the current target.
-
-* filedef.h (struct file): make CONSIDERED an unsigned int.
-* main.c (main): No longer need to reset CONSIDERED.
-* remake.c (update_goal_chain): increment CONSIDERED rather than
-inverting it between 0<->1.
-(update_file_1): Reset CONSIDERED to 0 so it's re-considered.
-(check_dep): Ditto.
-* tests/scripts/features/double_colon: Add a regression test.
----
-diff --git a/filedef.h b/filedef.h
-index 507a027..14b4187 100644
---- a/filedef.h
-+++ b/filedef.h
-@@ -58,6 +58,8 @@ struct file
- FILE_TIMESTAMP last_mtime; /* File's modtime, if already known. */
- FILE_TIMESTAMP mtime_before_update; /* File's modtime before any updating
- has been performed. */
-+ unsigned int considered; /* equal to 'considered' if file has been
-+ considered on current scan of goal chain */
- int command_flags; /* Flags OR'd in for cmds; see commands.h. */
- enum update_status /* Status of the last attempt to update. */
- {
-@@ -96,8 +98,6 @@ struct file
- unsigned int ignore_vpath:1;/* Nonzero if we threw out VPATH name. */
- unsigned int pat_searched:1;/* Nonzero if we already searched for
- pattern-specific variables. */
-- unsigned int considered:1; /* equal to 'considered' if file has been
-- considered on current scan of goal chain */
- unsigned int no_diag:1; /* True if the file failed to update and no
- diagnostics has been issued (dontcare). */
- };
-diff --git a/main.c b/main.c
-index 576f2e9..e606488 100644
---- a/main.c
-+++ b/main.c
-@@ -2262,10 +2262,6 @@ main (int argc, char **argv, char **envp)
-
- for (i = 0, d = read_files; d != 0; ++i, d = d->next)
- {
-- /* Reset the considered flag; we may need to look at the file
-- again to print an error. */
-- d->file->considered = 0;
--
- if (d->file->updated)
- {
- /* This makefile was updated. */
-diff --git a/remake.c b/remake.c
-index df1a9e0..5d5d67a 100644
---- a/remake.c
-+++ b/remake.c
-@@ -57,8 +57,9 @@ unsigned int commands_started = 0;
- static struct goaldep *goal_list;
- static struct dep *goal_dep;
-
--/* Current value for pruning the scan of the goal chain (toggle 0/1). */
--static unsigned int considered;
-+/* Current value for pruning the scan of the goal chain.
-+ All files start with considered == 0. */
-+static unsigned int considered = 0;
-
- static enum update_status update_file (struct file *file, unsigned int depth);
- static enum update_status update_file_1 (struct file *file, unsigned int depth);
-@@ -90,12 +91,12 @@ update_goal_chain (struct goaldep *goaldeps)
-
- goal_list = rebuilding_makefiles ? goaldeps : NULL;
-
-- /* All files start with the considered bit 0, so the global value is 1. */
-- considered = 1;
--
- #define MTIME(file) (rebuilding_makefiles ? file_mtime_no_search (file) \
- : file_mtime (file))
-
-+ /* Start a fresh batch of consideration. */
-+ ++considered;
-+
- /* Update all the goals until they are all finished. */
-
- while (goals != 0)
-@@ -247,10 +248,10 @@ update_goal_chain (struct goaldep *goaldeps)
- }
- }
-
-- /* If we reached the end of the dependency graph toggle the considered
-- flag for the next pass. */
-+ /* If we reached the end of the dependency graph update CONSIDERED
-+ for the next pass. */
- if (g == 0)
-- considered = !considered;
-+ ++considered;
- }
-
- if (rebuilding_makefiles)
-@@ -615,8 +616,8 @@ update_file_1 (struct file *file, unsigned int depth)
- break;
-
- if (!running)
-- /* The prereq is considered changed if the timestamp has changed while
-- it was built, OR it doesn't exist. */
-+ /* The prereq is considered changed if the timestamp has changed
-+ while it was built, OR it doesn't exist. */
- d->changed = ((file_mtime (d->file) != mtime)
- || (mtime == NONEXISTENT_MTIME));
-
-@@ -650,7 +651,7 @@ update_file_1 (struct file *file, unsigned int depth)
- /* 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;
-+ d->file->considered = 0;
-
- new = update_file (d->file, depth);
- if (new > dep_status)
-@@ -1087,7 +1088,7 @@ check_dep (struct file *file, unsigned int depth,
- /* If the target was waiting for a dependency it has to be
- reconsidered, as that dependency might have finished. */
- if (file->command_state == cs_deps_running)
-- file->considered = !considered;
-+ file->considered = 0;
-
- set_command_state (file, cs_not_started);
- }
-diff --git a/tests/scripts/features/double_colon b/tests/scripts/features/double_colon
-index 80ddb31..58f126f 100644
---- a/tests/scripts/features/double_colon
-+++ b/tests/scripts/features/double_colon
-@@ -197,6 +197,21 @@ all:: 3
- ',
- '-rs -j2 1 2 root', "all_one\nall_two\nroot\n");
-
-+# SV 47995 : Parallel double-colon rules with FORCE
-+
-+run_make_test('
-+all:: ; @echo one
-+
-+all:: joe ; @echo four
-+
-+joe: FORCE ; touch joe-is-forced
-+
-+FORCE:
-+',
-+ '-j5', "one\ntouch joe-is-forced\nfour\n");
-+
-+unlink('joe-is-forced');
-+
- # This tells the test driver that the perl test script executed properly.
- 1;
-
---
-cgit v0.9.0.2
diff --git a/sys-devel/make/files/make-4.2-reset_stack_limit_for_re-exec.patch b/sys-devel/make/files/make-4.2-reset_stack_limit_for_re-exec.patch
deleted file mode 100644
index 3844ff1..00000000
--- a/sys-devel/make/files/make-4.2-reset_stack_limit_for_re-exec.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a3d8c086d54c112fecfa2b9026a32a14f741f5f5 Mon Sep 17 00:00:00 2001
-From: Jeremy Devenport <jeremy.devenport@gmail.com>
-Date: Tue, 31 May 2016 07:09:24 +0000
-Subject: * main.c (main): [SV 48009] Reset stack limit for make re-exec.
-
-Copyright-paperwork-exempt: yes
----
-diff --git a/main.c b/main.c
-index e606488..fa8045f 100644
---- a/main.c
-+++ b/main.c
-@@ -2454,6 +2454,11 @@ main (int argc, char **argv, char **envp)
- exit (WIFEXITED(r) ? WEXITSTATUS(r) : EXIT_FAILURE);
- }
- #else
-+#ifdef SET_STACK_SIZE
-+ /* Reset limits, if necessary. */
-+ if (stack_limit.rlim_cur)
-+ setrlimit (RLIMIT_STACK, &stack_limit);
-+#endif
- exec_command ((char **)nargv, environ);
- #endif
- free (aargv);
---
-cgit v0.9.0.2
diff --git a/sys-devel/make/make-4.2-r2.ebuild b/sys-devel/make/make-4.2-r2.ebuild
deleted file mode 100644
index 11fb619..00000000
--- a/sys-devel/make/make-4.2-r2.ebuild
+++ /dev/null
@@ -1,51 +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
- "${FILESDIR}"/${PN}-4.2-double_colon_targets.patch
- "${FILESDIR}"/${PN}-4.2-reset_stack_limit_for_re-exec.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] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/make/files/, sys-devel/make/
@ 2017-04-14 16:28 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2017-04-14 16:28 UTC (permalink / raw
To: gentoo-commits
commit: 4fc1e8ada0799f72570e3c362af703dc17f81650
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 14 16:24:20 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr 14 16:27:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fc1e8ad
Revert "sys-devel/make: default CXX to c++ instead of g++, #589894"
The change was accidentally done to the stable ebuild. Will reland
with ~arch revbump.
Reverts: bace4a893fbf789675d576be2a291aef33db90f5
sys-devel/make/files/make-4.2-default-cxx.patch | 13 -------------
sys-devel/make/{make-4.2.1-r1.ebuild => make-4.2.1.ebuild} | 1 -
2 files changed, 14 deletions(-)
diff --git a/sys-devel/make/files/make-4.2-default-cxx.patch b/sys-devel/make/files/make-4.2-default-cxx.patch
deleted file mode 100644
index 4d592086a6f..00000000000
--- a/sys-devel/make/files/make-4.2-default-cxx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/default.c b/default.c
-index 3d865c7..e8b3ed6 100644
---- a/default.c
-+++ b/default.c
-@@ -530,7 +530,7 @@ static const char *default_variables[] =
- "OBJC", "gcc",
- #else
- "CC", "cc",
-- "CXX", "g++",
-+ "CXX", "c++",
- "OBJC", "cc",
- #endif
-
diff --git a/sys-devel/make/make-4.2.1-r1.ebuild b/sys-devel/make/make-4.2.1.ebuild
similarity index 96%
rename from sys-devel/make/make-4.2.1-r1.ebuild
rename to sys-devel/make/make-4.2.1.ebuild
index 17448b34b98..70e90b6bf62 100644
--- a/sys-devel/make/make-4.2.1-r1.ebuild
+++ b/sys-devel/make/make-4.2.1.ebuild
@@ -22,7 +22,6 @@ RDEPEND="${CDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch
- "${FILESDIR}"/${PN}-4.2-default-cxx.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/make/files/, sys-devel/make/
@ 2018-02-11 0:09 Andreas Hüttel
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Hüttel @ 2018-02-11 0:09 UTC (permalink / raw
To: gentoo-commits
commit: 7fedeea1187d03f8e755542c2fd4a982e15b9046
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 11 00:08:51 2018 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 00:08:51 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fedeea1
sys-devel/make: Fix build and tests with sys-libs/glibc-2.27, bug 646558
Closes: https://bugs.gentoo.org/646558
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../make/files/make-4.2.1-glob-internals.patch | 67 ++++++++++++++++++++++
sys-devel/make/files/make-4.2.1-glob-v2.patch | 28 +++++++++
sys-devel/make/make-4.2.1-r1.ebuild | 2 +
3 files changed, 97 insertions(+)
diff --git a/sys-devel/make/files/make-4.2.1-glob-internals.patch b/sys-devel/make/files/make-4.2.1-glob-internals.patch
new file mode 100644
index 00000000000..9f70ae2084f
--- /dev/null
+++ b/sys-devel/make/files/make-4.2.1-glob-internals.patch
@@ -0,0 +1,67 @@
+From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Sun, 24 Sep 2017 09:12:58 -0400
+Subject: [PATCH] glob: Do not assume glibc glob internals.
+
+It has been proposed that glibc glob start using gl_lstat,
+which the API allows it to do. GNU 'make' should not get in
+the way of this. See:
+https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html
+
+* dir.c (local_lstat): New function, like local_stat.
+(dir_setup_glob): Use it to initialize gl_lstat too, as the API
+requires.
+---
+ dir.c | 29 +++++++++++++++++++++++++++--
+ 1 file changed, 27 insertions(+), 2 deletions(-)
+
+diff --git a/dir.c b/dir.c
+index adbb8a9..c343e4c 100644
+--- a/dir.c
++++ b/dir.c
+@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf)
+ }
+ #endif
+
++/* Similarly for lstat. */
++#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)
++# ifndef VMS
++# ifndef HAVE_SYS_STAT_H
++int lstat (const char *path, struct stat *sbuf);
++# endif
++# else
++ /* We are done with the fake lstat. Go back to the real lstat */
++# ifdef lstat
++# undef lstat
++# endif
++# endif
++# define local_lstat lstat
++#elif defined(WINDOWS32)
++/* Windows doesn't support lstat(). */
++# define local_lstat local_stat
++#else
++static int
++local_lstat (const char *path, struct stat *buf)
++{
++ int e;
++ EINTRLOOP (e, lstat (path, buf));
++ return e;
++}
++#endif
++
+ void
+ dir_setup_glob (glob_t *gl)
+ {
+ gl->gl_opendir = open_dirstream;
+ gl->gl_readdir = read_dirstream;
+ gl->gl_closedir = free;
++ gl->gl_lstat = local_lstat;
+ gl->gl_stat = local_stat;
+- /* We don't bother setting gl_lstat, since glob never calls it.
+- The slot is only there for compatibility with 4.4 BSD. */
+ }
+
+ void
+--
+2.16.1
+
diff --git a/sys-devel/make/files/make-4.2.1-glob-v2.patch b/sys-devel/make/files/make-4.2.1-glob-v2.patch
new file mode 100644
index 00000000000..a9aeb787cd7
--- /dev/null
+++ b/sys-devel/make/files/make-4.2.1-glob-v2.patch
@@ -0,0 +1,28 @@
+From 48c8a116a914a325a0497721f5d8b58d5bba34d4 Mon Sep 17 00:00:00 2001
+From: Paul Smith <psmith@gnu.org>
+Date: Sun, 19 Nov 2017 15:09:16 -0500
+Subject: [PATCH] * configure.ac: Support GLIBC glob interface version 2
+
+---
+ configure.ac | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8c72568..4710832 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -404,10 +404,9 @@ AC_CACHE_CHECK([if system libc has GNU glob], [make_cv_sys_gnu_glob],
+ #include <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],
+--
+2.16.1
+
diff --git a/sys-devel/make/make-4.2.1-r1.ebuild b/sys-devel/make/make-4.2.1-r1.ebuild
index 56c8753a0e7..d0f079cef26 100644
--- a/sys-devel/make/make-4.2.1-r1.ebuild
+++ b/sys-devel/make/make-4.2.1-r1.ebuild
@@ -24,6 +24,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch
"${FILESDIR}"/${PN}-4.2-default-cxx.patch
"${FILESDIR}"/${PN}-4.2.1-perl526.patch
+ "${FILESDIR}"/${PN}-4.2.1-glob-internals.patch
+ "${FILESDIR}"/${PN}-4.2.1-glob-v2.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/make/files/, sys-devel/make/
@ 2021-05-14 22:14 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2021-05-14 22:14 UTC (permalink / raw
To: gentoo-commits
commit: a744d84288f6863e0536e11460302232141f0c4a
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri May 14 22:13:28 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri May 14 22:13:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a744d842
sys-devel/make: drop 4.2.1-r4
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-devel/make/Manifest | 1 -
.../make/files/make-4.2.1-glob-internals.patch | 67 -----
sys-devel/make/files/make-4.2.1-glob-v2.patch | 30 --
sys-devel/make/files/make-4.2.1-guile-2.2.patch | 320 ---------------------
sys-devel/make/files/make-4.2.1-perl526.patch | 26 --
.../files/make-4.2.1-pselect-non-blocking.patch | 172 -----------
sys-devel/make/make-4.2.1-r4.ebuild | 59 ----
7 files changed, 675 deletions(-)
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index df3d822af62..34d9f6842b0 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -1,2 +1 @@
-DIST make-4.2.1.tar.bz2 1407126 BLAKE2B fa6d43f5fd46182182a296c58dcd138a1a4568104eda760bbb3c241c023dee216789cf3128e5ac2b416cec76e1ba82d5b5e7852da12e86138a7d0865c85a42b4 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8
DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b
diff --git a/sys-devel/make/files/make-4.2.1-glob-internals.patch b/sys-devel/make/files/make-4.2.1-glob-internals.patch
deleted file mode 100644
index 9f70ae2084f..00000000000
--- a/sys-devel/make/files/make-4.2.1-glob-internals.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Sun, 24 Sep 2017 09:12:58 -0400
-Subject: [PATCH] glob: Do not assume glibc glob internals.
-
-It has been proposed that glibc glob start using gl_lstat,
-which the API allows it to do. GNU 'make' should not get in
-the way of this. See:
-https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html
-
-* dir.c (local_lstat): New function, like local_stat.
-(dir_setup_glob): Use it to initialize gl_lstat too, as the API
-requires.
----
- dir.c | 29 +++++++++++++++++++++++++++--
- 1 file changed, 27 insertions(+), 2 deletions(-)
-
-diff --git a/dir.c b/dir.c
-index adbb8a9..c343e4c 100644
---- a/dir.c
-+++ b/dir.c
-@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf)
- }
- #endif
-
-+/* Similarly for lstat. */
-+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)
-+# ifndef VMS
-+# ifndef HAVE_SYS_STAT_H
-+int lstat (const char *path, struct stat *sbuf);
-+# endif
-+# else
-+ /* We are done with the fake lstat. Go back to the real lstat */
-+# ifdef lstat
-+# undef lstat
-+# endif
-+# endif
-+# define local_lstat lstat
-+#elif defined(WINDOWS32)
-+/* Windows doesn't support lstat(). */
-+# define local_lstat local_stat
-+#else
-+static int
-+local_lstat (const char *path, struct stat *buf)
-+{
-+ int e;
-+ EINTRLOOP (e, lstat (path, buf));
-+ return e;
-+}
-+#endif
-+
- void
- dir_setup_glob (glob_t *gl)
- {
- gl->gl_opendir = open_dirstream;
- gl->gl_readdir = read_dirstream;
- gl->gl_closedir = free;
-+ gl->gl_lstat = local_lstat;
- gl->gl_stat = local_stat;
-- /* We don't bother setting gl_lstat, since glob never calls it.
-- The slot is only there for compatibility with 4.4 BSD. */
- }
-
- void
---
-2.16.1
-
diff --git a/sys-devel/make/files/make-4.2.1-glob-v2.patch b/sys-devel/make/files/make-4.2.1-glob-v2.patch
deleted file mode 100644
index e55a7790a3f..00000000000
--- a/sys-devel/make/files/make-4.2.1-glob-v2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116a914a325a0497721f5d8b58d5bba34d4
-
---- make-4.2.1/configure 2016-06-11 01:03:21.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>
-
--#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],
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
deleted file mode 100644
index b7f9eb50b78..00000000000
--- a/sys-devel/make/files/make-4.2.1-guile-2.2.patch
+++ /dev/null
@@ -1,320 +0,0 @@
-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/files/make-4.2.1-perl526.patch b/sys-devel/make/files/make-4.2.1-perl526.patch
deleted file mode 100644
index a935d1314eb..00000000000
--- a/sys-devel/make/files/make-4.2.1-perl526.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d9d4e06084a4c7da480bd49a3487aadf6ba77b54 Mon Sep 17 00:00:00 2001
-From: Enrique Olaizola <enrique_olaizola16@hotmail.com>
-Date: Sat, 27 May 2017 14:24:33 -0400
-Subject: [PATCH] * tests/run_make_tests.pl: [SV 50902] Find Perl modules
-
----
- tests/run_make_tests.pl | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tests/run_make_tests.pl b/tests/run_make_tests.pl
-index a74417a..a844094 100644
---- a/tests/run_make_tests.pl
-+++ b/tests/run_make_tests.pl
-@@ -64,6 +64,9 @@ if ($^O eq 'VMS')
- $CMD_rmfile = 'delete_file -no_ask';
- }
-
-+use FindBin;
-+use lib "$FindBin::Bin";
-+
- require "test_driver.pl";
- require "config-flags.pm";
-
---
-2.16.1
-
diff --git a/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
deleted file mode 100644
index 61e19516f3c..00000000000
--- a/sys-devel/make/files/make-4.2.1-pselect-non-blocking.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-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
deleted file mode 100644
index d5fead12467..00000000000
--- a/sys-devel/make/make-4.2.1-r4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="guile nls static"
-
-CDEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
-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] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/make/files/, sys-devel/make/
@ 2023-02-19 18:05 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-02-19 18:05 UTC (permalink / raw
To: gentoo-commits
commit: b236fbece3f4fad456f65583550ff693bc13619e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 19 18:05:02 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 18:05:12 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b236fbec
sys-devel/make: add 4.4.0.91
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-devel/make/Manifest | 2 +
sys-devel/make/files/make-4.4-default-cxx.patch | 11 ++++
sys-devel/make/make-4.4.0.91.ebuild | 79 +++++++++++++++++++++++++
3 files changed, 92 insertions(+)
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index cb6f278d5cb1..bf1e7143119a 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -2,5 +2,7 @@ DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a6
DIST make-4.3.tar.gz.sig 566 BLAKE2B 75bf71602e60f97ec8efa81676329047746d960257ef310b89a059144c00628b6a1ddf7a16a2ac2c3e935b8591475f5043a7c7546668ab39abbc4717c75a6528 SHA512 bf13e2943593b153457c8111179e8ae11cef2d9185a986106a1e70946a260bd930505a5e10002c5a60888e11affc07713c367b8680fd511ad87b2e124d303a99
DIST make-4.4.0.90.tar.gz 2328399 BLAKE2B fc260a3c942b00d57bc64fc037e4e4a510000ec281194122e3315f0ca7c6fe3507877c84bff62e197f5df45e1d5d95aae347085e225377788ebd466a1327cb25 SHA512 e693e6146871dcaf5b65b6c05b620047b6c2a3474b02ecc58cf4698f88107cc7a7b0d35551eb209c772b09ea7db2ffde13fe984d6227339974ca54a68b99839b
DIST make-4.4.0.90.tar.gz.sig 833 BLAKE2B b0a2d98f5a99ee29523c6b25be4b29bfb193773ab5b70ce26adf75a066e30ca95d79b111eedc656e817246cfaf7f9345014626b12de5a381e44e4b6f8ddd5be1 SHA512 7a20c6058221b1003a26806f65d7b568575f88187562b89b7593c67dfc2b15569cd92c75c23056b2a3ff7577f96794835f1b6d5d9f5f5b92c59acb3af8efc944
+DIST make-4.4.0.91.tar.gz 2345140 BLAKE2B 3e28fa6e74684329f41aab69aa3558e45381b64964cacd4c83611df86d7ade69cec9561248c817b2e3f52db60c2821e34603d68e1957377c05c48e6b09a93295 SHA512 7798340062edf15c0ad459c3f9741125337c5bf59e002cc109b4e5d59e7cf9c510f4fcf33aba0bf61a0e91d6259f84d6cffabfe7a3eb45a07e70a5ba54e91d37
+DIST make-4.4.0.91.tar.gz.sig 833 BLAKE2B 7d86e8cfb5018ab32701379b7b04777c032d40d0fe02469ddb2113f3878079ee3e99a69636c5a2a42d0a20e43f833f88709d456255418ae4007fb18ebda4ab0d SHA512 950e11c5c27d198846d0c871f5e3d9b4bd3afa43aa9819cd293c3c97083b7df4c5b7cc5959b17c488433bba3e64a53ab51805bad5788b106d462fb97f7ea2fb2
DIST make-4.4.tar.gz 2307891 BLAKE2B 5b8a2fcd7610c33347c2e552fdc4f2698c9a4c468de588c9687cd11d15f120a37768bcd521231adf32359e3b48b27ab7b142746fd18b1a8d15578d34344f487e SHA512 4be73f494295dcfa10034531b0d920cfdb5438bc20625f863f5c878549c140e1e67195162580c53060c3c11c67a2c739c09051f02cdd283e5aa9ebcd68975a1f
DIST make-4.4.tar.gz.sig 566 BLAKE2B 879e85eccd748a9e6687e8beaaf1321ad84986990290c34d34285eab96fe9d493db1e6f20178aa5374796da9c8fb58f87065ea2de44a6daa55dd23dcc8b09c8f SHA512 76b7ecb3aa38b0a6867fd0379e42d2cae6632f102d902ac604e7ea3265ac1c1090da8e5676bd56b9946dc291e57c06bb05c953f76714fe8bd27b924bb39301e6
diff --git a/sys-devel/make/files/make-4.4-default-cxx.patch b/sys-devel/make/files/make-4.4-default-cxx.patch
new file mode 100644
index 000000000000..4a56df5da2c8
--- /dev/null
+++ b/sys-devel/make/files/make-4.4-default-cxx.patch
@@ -0,0 +1,11 @@
+--- a/src/default.c
++++ b/src/default.c
+@@ -542,7 +542,7 @@ static const char *default_variables[] =
+ "CXX", "gcc",
+ # endif /* __MSDOS__ */
+ # else
+- "CXX", "g++",
++ "CXX", "c++",
+ # endif
+ #endif
+ /* This expands to $(CO) $(COFLAGS) $< $@ if $@ does not exist,
diff --git a/sys-devel/make/make-4.4.0.91.ebuild b/sys-devel/make/make-4.4.0.91.ebuild
new file mode 100644
index 000000000000..27cc510be3c6
--- /dev/null
+++ b/sys-devel/make/make-4.4.0.91.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/make.asc
+inherit flag-o-matic verify-sig
+
+DESCRIPTION="Standard tool to compile source trees"
+HOMEPAGE="https://www.gnu.org/software/make/make.html"
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://git.savannah.gnu.org/git/make.git"
+ inherit autotools git-r3
+elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
+ SRC_URI="https://alpha.gnu.org/gnu/make/${P}.tar.gz"
+ SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/make/${P}.tar.gz.sig )"
+else
+ SRC_URI="mirror://gnu/make/${P}.tar.gz"
+ SRC_URI+=" verify-sig? ( mirror://gnu/make/${P}.tar.gz.sig )"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="guile nls static"
+
+DEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
+RDEPEND="
+ ${DEPEND}
+ nls? ( virtual/libintl )
+"
+BDEPEND="
+ nls? ( sys-devel/gettext )
+ verify-sig? ( sec-keys/openpgp-keys-make )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.4-default-cxx.patch
+)
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]] ; then
+ git-r3_src_unpack
+
+ cd "${S}" || die
+ ./bootstrap || die
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == 9999 ]] ; then
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ use static && append-ldflags -static
+ local myeconfargs=(
+ --program-prefix=g
+ $(use_with guile)
+ $(use_enable nls)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS NEWS README*
+ if [[ ${USERLAND} == "GNU" ]] ; then
+ # we install everywhere as 'gmake' but on GNU systems,
+ # symlink 'make' to 'gmake'
+ dosym gmake /usr/bin/make
+ dosym gmake.1 /usr/share/man/man1/make.1
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-02-19 18:05 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-14 22:14 [gentoo-commits] repo/gentoo:master commit in: sys-devel/make/files/, sys-devel/make/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2023-02-19 18:05 Sam James
2018-02-11 0:09 Andreas Hüttel
2017-04-14 16:28 Michał Górny
2017-01-22 18:22 Lars Wendler
2016-05-31 9:06 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox