1 |
commit: a744d84288f6863e0536e11460302232141f0c4a |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 14 22:13:28 2021 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 14 22:13:28 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a744d842 |
7 |
|
8 |
sys-devel/make: drop 4.2.1-r4 |
9 |
|
10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
11 |
|
12 |
sys-devel/make/Manifest | 1 - |
13 |
.../make/files/make-4.2.1-glob-internals.patch | 67 ----- |
14 |
sys-devel/make/files/make-4.2.1-glob-v2.patch | 30 -- |
15 |
sys-devel/make/files/make-4.2.1-guile-2.2.patch | 320 --------------------- |
16 |
sys-devel/make/files/make-4.2.1-perl526.patch | 26 -- |
17 |
.../files/make-4.2.1-pselect-non-blocking.patch | 172 ----------- |
18 |
sys-devel/make/make-4.2.1-r4.ebuild | 59 ---- |
19 |
7 files changed, 675 deletions(-) |
20 |
|
21 |
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest |
22 |
index df3d822af62..34d9f6842b0 100644 |
23 |
--- a/sys-devel/make/Manifest |
24 |
+++ b/sys-devel/make/Manifest |
25 |
@@ -1,2 +1 @@ |
26 |
-DIST make-4.2.1.tar.bz2 1407126 BLAKE2B fa6d43f5fd46182182a296c58dcd138a1a4568104eda760bbb3c241c023dee216789cf3128e5ac2b416cec76e1ba82d5b5e7852da12e86138a7d0865c85a42b4 SHA512 9cf00869a2f938492554f71d8cb288b5b009b3bd0489ef164f2c8f6532fc37db5c7e20af1dea288536e7c9710ee0bc6e1ddcdfc4928a8540e6e43661741825b8 |
27 |
DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a611941cf42136b2453b34236ab55382eab0a593c43cee8b036ba4a054f966c41ba766fdbd2862942be5dff SHA512 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b |
28 |
|
29 |
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 |
30 |
deleted file mode 100644 |
31 |
index 9f70ae2084f..00000000000 |
32 |
--- a/sys-devel/make/files/make-4.2.1-glob-internals.patch |
33 |
+++ /dev/null |
34 |
@@ -1,67 +0,0 @@ |
35 |
-From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001 |
36 |
-From: Paul Eggert <eggert@×××××××.edu> |
37 |
-Date: Sun, 24 Sep 2017 09:12:58 -0400 |
38 |
-Subject: [PATCH] glob: Do not assume glibc glob internals. |
39 |
- |
40 |
-It has been proposed that glibc glob start using gl_lstat, |
41 |
-which the API allows it to do. GNU 'make' should not get in |
42 |
-the way of this. See: |
43 |
-https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html |
44 |
- |
45 |
-* dir.c (local_lstat): New function, like local_stat. |
46 |
-(dir_setup_glob): Use it to initialize gl_lstat too, as the API |
47 |
-requires. |
48 |
---- |
49 |
- dir.c | 29 +++++++++++++++++++++++++++-- |
50 |
- 1 file changed, 27 insertions(+), 2 deletions(-) |
51 |
- |
52 |
-diff --git a/dir.c b/dir.c |
53 |
-index adbb8a9..c343e4c 100644 |
54 |
---- a/dir.c |
55 |
-+++ b/dir.c |
56 |
-@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf) |
57 |
- } |
58 |
- #endif |
59 |
- |
60 |
-+/* Similarly for lstat. */ |
61 |
-+#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS) |
62 |
-+# ifndef VMS |
63 |
-+# ifndef HAVE_SYS_STAT_H |
64 |
-+int lstat (const char *path, struct stat *sbuf); |
65 |
-+# endif |
66 |
-+# else |
67 |
-+ /* We are done with the fake lstat. Go back to the real lstat */ |
68 |
-+# ifdef lstat |
69 |
-+# undef lstat |
70 |
-+# endif |
71 |
-+# endif |
72 |
-+# define local_lstat lstat |
73 |
-+#elif defined(WINDOWS32) |
74 |
-+/* Windows doesn't support lstat(). */ |
75 |
-+# define local_lstat local_stat |
76 |
-+#else |
77 |
-+static int |
78 |
-+local_lstat (const char *path, struct stat *buf) |
79 |
-+{ |
80 |
-+ int e; |
81 |
-+ EINTRLOOP (e, lstat (path, buf)); |
82 |
-+ return e; |
83 |
-+} |
84 |
-+#endif |
85 |
-+ |
86 |
- void |
87 |
- dir_setup_glob (glob_t *gl) |
88 |
- { |
89 |
- gl->gl_opendir = open_dirstream; |
90 |
- gl->gl_readdir = read_dirstream; |
91 |
- gl->gl_closedir = free; |
92 |
-+ gl->gl_lstat = local_lstat; |
93 |
- gl->gl_stat = local_stat; |
94 |
-- /* We don't bother setting gl_lstat, since glob never calls it. |
95 |
-- The slot is only there for compatibility with 4.4 BSD. */ |
96 |
- } |
97 |
- |
98 |
- void |
99 |
--- |
100 |
-2.16.1 |
101 |
- |
102 |
|
103 |
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 |
104 |
deleted file mode 100644 |
105 |
index e55a7790a3f..00000000000 |
106 |
--- a/sys-devel/make/files/make-4.2.1-glob-v2.patch |
107 |
+++ /dev/null |
108 |
@@ -1,30 +0,0 @@ |
109 |
-http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116a914a325a0497721f5d8b58d5bba34d4 |
110 |
- |
111 |
---- make-4.2.1/configure 2016-06-11 01:03:21.000000000 +0200 |
112 |
-+++ make-4.2.1/configure 2016-06-11 01:03:21.000000000 +0200 |
113 |
-@@ -11481,10 +11481,9 @@ |
114 |
- #include <glob.h> |
115 |
- #include <fnmatch.h> |
116 |
- |
117 |
--#define GLOB_INTERFACE_VERSION 1 |
118 |
- #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 |
119 |
- # include <gnu-versions.h> |
120 |
--# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION |
121 |
-+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 |
122 |
- gnu glob |
123 |
- # endif |
124 |
- #endif |
125 |
---- make-4.2.1/configure.ac 2016-06-06 14:27:31.000000000 +0200 |
126 |
-+++ make-4.2.1/configure.ac 2016-06-06 14:27:31.000000000 +0200 |
127 |
-@@ -399,10 +399,9 @@ |
128 |
- #include <glob.h> |
129 |
- #include <fnmatch.h> |
130 |
- |
131 |
--#define GLOB_INTERFACE_VERSION 1 |
132 |
- #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1 |
133 |
- # include <gnu-versions.h> |
134 |
--# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION |
135 |
-+# if _GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 |
136 |
- gnu glob |
137 |
- # endif |
138 |
- #endif], |
139 |
|
140 |
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 |
141 |
deleted file mode 100644 |
142 |
index b7f9eb50b78..00000000000 |
143 |
--- a/sys-devel/make/files/make-4.2.1-guile-2.2.patch |
144 |
+++ /dev/null |
145 |
@@ -1,320 +0,0 @@ |
146 |
-https://git.savannah.gnu.org/cgit/make.git/commit/?id=fbf71ec25a5986d9003ac16ee9e23675feac9053 |
147 |
-https://bugs.gentoo.org/650608 |
148 |
- |
149 |
---- make-4.2.1/configure 2016-06-11 01:03:21.000000000 +0200 |
150 |
-+++ make-4.2.1/configure 2016-06-11 01:03:21.000000000 +0200 |
151 |
-@@ -9694,6 +9694,15 @@ |
152 |
- |
153 |
- # See if the user wants to add (or not) GNU Guile support |
154 |
- |
155 |
-+# Check whether --with-guile was given. |
156 |
-+if test "${with_guile+set}" = set; then : |
157 |
-+ withval=$with_guile; |
158 |
-+fi |
159 |
-+ |
160 |
-+ |
161 |
-+# Annoyingly, each version of Guile comes with it's own PC file so we have to |
162 |
-+# specify them as individual packages. Ugh. |
163 |
-+ |
164 |
- |
165 |
- |
166 |
- |
167 |
-@@ -9814,75 +9823,25 @@ |
168 |
- fi |
169 |
- fi |
170 |
- |
171 |
--# Check whether --with-guile was given. |
172 |
--if test "${with_guile+set}" = set; then : |
173 |
-- withval=$with_guile; |
174 |
--fi |
175 |
-- |
176 |
-- |
177 |
--# For some strange reason, at least on Ubuntu, each version of Guile |
178 |
--# comes with it's own PC file so we have to specify them as individual |
179 |
--# packages. Ugh. |
180 |
- if test "x$with_guile" != xno; then : |
181 |
-- |
182 |
--pkg_failed=no |
183 |
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUILE" >&5 |
184 |
--$as_echo_n "checking for GUILE... " >&6; } |
185 |
-- |
186 |
--if test -n "$GUILE_CFLAGS"; then |
187 |
-- pkg_cv_GUILE_CFLAGS="$GUILE_CFLAGS" |
188 |
-- elif test -n "$PKG_CONFIG"; then |
189 |
-- if test -n "$PKG_CONFIG" && \ |
190 |
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.0\""; } >&5 |
191 |
-- ($PKG_CONFIG --exists --print-errors "guile-2.0") 2>&5 |
192 |
-- ac_status=$? |
193 |
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
194 |
-- test $ac_status = 0; }; then |
195 |
-- pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-2.0" 2>/dev/null` |
196 |
-- test "x$?" != "x0" && pkg_failed=yes |
197 |
--else |
198 |
-- pkg_failed=yes |
199 |
--fi |
200 |
-- else |
201 |
-- pkg_failed=untried |
202 |
--fi |
203 |
--if test -n "$GUILE_LIBS"; then |
204 |
-- pkg_cv_GUILE_LIBS="$GUILE_LIBS" |
205 |
-- elif test -n "$PKG_CONFIG"; then |
206 |
-+ guile_versions="2.2 2.0 1.8" |
207 |
-+ guile_version=no |
208 |
-+ have_guile=no |
209 |
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU Guile" >&5 |
210 |
-+$as_echo_n "checking for GNU Guile... " >&6; } |
211 |
-+ for v in $guile_versions; do |
212 |
- if test -n "$PKG_CONFIG" && \ |
213 |
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.0\""; } >&5 |
214 |
-- ($PKG_CONFIG --exists --print-errors "guile-2.0") 2>&5 |
215 |
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-\$v\""; } >&5 |
216 |
-+ ($PKG_CONFIG --exists --print-errors "guile-$v") 2>&5 |
217 |
- ac_status=$? |
218 |
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
219 |
- test $ac_status = 0; }; then |
220 |
-- pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-2.0" 2>/dev/null` |
221 |
-- test "x$?" != "x0" && pkg_failed=yes |
222 |
--else |
223 |
-- pkg_failed=yes |
224 |
-+ guile_version=$v; have_guile=yes; break |
225 |
- fi |
226 |
-- else |
227 |
-- pkg_failed=untried |
228 |
--fi |
229 |
-- |
230 |
-- |
231 |
-- |
232 |
--if test $pkg_failed = yes; then |
233 |
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
234 |
--$as_echo "no" >&6; } |
235 |
-- |
236 |
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
237 |
-- _pkg_short_errors_supported=yes |
238 |
--else |
239 |
-- _pkg_short_errors_supported=no |
240 |
--fi |
241 |
-- if test $_pkg_short_errors_supported = yes; then |
242 |
-- GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-2.0" 2>&1` |
243 |
-- else |
244 |
-- GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-2.0" 2>&1` |
245 |
-- fi |
246 |
-- # Put the nasty error message in config.log where it belongs |
247 |
-- echo "$GUILE_PKG_ERRORS" >&5 |
248 |
-- |
249 |
-+ done |
250 |
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $guile_version" >&5 |
251 |
-+$as_echo "$guile_version" >&6; } |
252 |
-+ if test "$have_guile" = yes; then |
253 |
- |
254 |
- pkg_failed=no |
255 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUILE" >&5 |
256 |
-@@ -9892,12 +9851,12 @@ |
257 |
- pkg_cv_GUILE_CFLAGS="$GUILE_CFLAGS" |
258 |
- elif test -n "$PKG_CONFIG"; then |
259 |
- if test -n "$PKG_CONFIG" && \ |
260 |
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-1.8\""; } >&5 |
261 |
-- ($PKG_CONFIG --exists --print-errors "guile-1.8") 2>&5 |
262 |
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-\$guile_version\""; } >&5 |
263 |
-+ ($PKG_CONFIG --exists --print-errors "guile-$guile_version") 2>&5 |
264 |
- ac_status=$? |
265 |
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
266 |
- test $ac_status = 0; }; then |
267 |
-- pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-1.8" 2>/dev/null` |
268 |
-+ pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-$guile_version" 2>/dev/null` |
269 |
- test "x$?" != "x0" && pkg_failed=yes |
270 |
- else |
271 |
- pkg_failed=yes |
272 |
-@@ -9909,12 +9868,12 @@ |
273 |
- pkg_cv_GUILE_LIBS="$GUILE_LIBS" |
274 |
- elif test -n "$PKG_CONFIG"; then |
275 |
- if test -n "$PKG_CONFIG" && \ |
276 |
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-1.8\""; } >&5 |
277 |
-- ($PKG_CONFIG --exists --print-errors "guile-1.8") 2>&5 |
278 |
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-\$guile_version\""; } >&5 |
279 |
-+ ($PKG_CONFIG --exists --print-errors "guile-$guile_version") 2>&5 |
280 |
- ac_status=$? |
281 |
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
282 |
- test $ac_status = 0; }; then |
283 |
-- pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-1.8" 2>/dev/null` |
284 |
-+ pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-$guile_version" 2>/dev/null` |
285 |
- test "x$?" != "x0" && pkg_failed=yes |
286 |
- else |
287 |
- pkg_failed=yes |
288 |
-@@ -9935,113 +9894,50 @@ |
289 |
- _pkg_short_errors_supported=no |
290 |
- fi |
291 |
- if test $_pkg_short_errors_supported = yes; then |
292 |
-- GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-1.8" 2>&1` |
293 |
-+ GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-$guile_version" 2>&1` |
294 |
- else |
295 |
-- GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-1.8" 2>&1` |
296 |
-+ GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-$guile_version" 2>&1` |
297 |
- fi |
298 |
- # Put the nasty error message in config.log where it belongs |
299 |
- echo "$GUILE_PKG_ERRORS" >&5 |
300 |
- |
301 |
-- have_guile=no |
302 |
--elif test $pkg_failed = untried; then |
303 |
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
304 |
--$as_echo "no" >&6; } |
305 |
-- have_guile=no |
306 |
--else |
307 |
-- GUILE_CFLAGS=$pkg_cv_GUILE_CFLAGS |
308 |
-- GUILE_LIBS=$pkg_cv_GUILE_LIBS |
309 |
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
310 |
--$as_echo "yes" >&6; } |
311 |
-- have_guile=yes |
312 |
--fi |
313 |
--elif test $pkg_failed = untried; then |
314 |
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
315 |
--$as_echo "no" >&6; } |
316 |
-+ as_fn_error $? "Package requirements (guile-$guile_version) were not met: |
317 |
- |
318 |
--pkg_failed=no |
319 |
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUILE" >&5 |
320 |
--$as_echo_n "checking for GUILE... " >&6; } |
321 |
-+$GUILE_PKG_ERRORS |
322 |
- |
323 |
--if test -n "$GUILE_CFLAGS"; then |
324 |
-- pkg_cv_GUILE_CFLAGS="$GUILE_CFLAGS" |
325 |
-- elif test -n "$PKG_CONFIG"; then |
326 |
-- if test -n "$PKG_CONFIG" && \ |
327 |
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-1.8\""; } >&5 |
328 |
-- ($PKG_CONFIG --exists --print-errors "guile-1.8") 2>&5 |
329 |
-- ac_status=$? |
330 |
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
331 |
-- test $ac_status = 0; }; then |
332 |
-- pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-1.8" 2>/dev/null` |
333 |
-- test "x$?" != "x0" && pkg_failed=yes |
334 |
--else |
335 |
-- pkg_failed=yes |
336 |
--fi |
337 |
-- else |
338 |
-- pkg_failed=untried |
339 |
--fi |
340 |
--if test -n "$GUILE_LIBS"; then |
341 |
-- pkg_cv_GUILE_LIBS="$GUILE_LIBS" |
342 |
-- elif test -n "$PKG_CONFIG"; then |
343 |
-- if test -n "$PKG_CONFIG" && \ |
344 |
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-1.8\""; } >&5 |
345 |
-- ($PKG_CONFIG --exists --print-errors "guile-1.8") 2>&5 |
346 |
-- ac_status=$? |
347 |
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
348 |
-- test $ac_status = 0; }; then |
349 |
-- pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-1.8" 2>/dev/null` |
350 |
-- test "x$?" != "x0" && pkg_failed=yes |
351 |
--else |
352 |
-- pkg_failed=yes |
353 |
--fi |
354 |
-- else |
355 |
-- pkg_failed=untried |
356 |
--fi |
357 |
-- |
358 |
-- |
359 |
-- |
360 |
--if test $pkg_failed = yes; then |
361 |
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
362 |
--$as_echo "no" >&6; } |
363 |
-- |
364 |
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
365 |
-- _pkg_short_errors_supported=yes |
366 |
--else |
367 |
-- _pkg_short_errors_supported=no |
368 |
--fi |
369 |
-- if test $_pkg_short_errors_supported = yes; then |
370 |
-- GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-1.8" 2>&1` |
371 |
-- else |
372 |
-- GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-1.8" 2>&1` |
373 |
-- fi |
374 |
-- # Put the nasty error message in config.log where it belongs |
375 |
-- echo "$GUILE_PKG_ERRORS" >&5 |
376 |
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you |
377 |
-+installed software in a non-standard prefix. |
378 |
- |
379 |
-- have_guile=no |
380 |
-+Alternatively, you may set the environment variables GUILE_CFLAGS |
381 |
-+and GUILE_LIBS to avoid the need to call pkg-config. |
382 |
-+See the pkg-config man page for more details." "$LINENO" 5 |
383 |
- elif test $pkg_failed = untried; then |
384 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
385 |
- $as_echo "no" >&6; } |
386 |
-- have_guile=no |
387 |
--else |
388 |
-- GUILE_CFLAGS=$pkg_cv_GUILE_CFLAGS |
389 |
-- GUILE_LIBS=$pkg_cv_GUILE_LIBS |
390 |
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
391 |
--$as_echo "yes" >&6; } |
392 |
-- have_guile=yes |
393 |
--fi |
394 |
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
395 |
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
396 |
-+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it |
397 |
-+is in your PATH or set the PKG_CONFIG environment variable to the full |
398 |
-+path to pkg-config. |
399 |
-+ |
400 |
-+Alternatively, you may set the environment variables GUILE_CFLAGS |
401 |
-+and GUILE_LIBS to avoid the need to call pkg-config. |
402 |
-+See the pkg-config man page for more details. |
403 |
-+ |
404 |
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>. |
405 |
-+See \`config.log' for more details" "$LINENO" 5; } |
406 |
- else |
407 |
- GUILE_CFLAGS=$pkg_cv_GUILE_CFLAGS |
408 |
- GUILE_LIBS=$pkg_cv_GUILE_LIBS |
409 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
410 |
- $as_echo "yes" >&6; } |
411 |
-- have_guile=yes |
412 |
--fi |
413 |
- |
414 |
- fi |
415 |
- |
416 |
--if test "$have_guile" = yes; then : |
417 |
-- |
418 |
- $as_echo "#define HAVE_GUILE 1" >>confdefs.h |
419 |
- |
420 |
-+ fi |
421 |
-+ |
422 |
- fi |
423 |
- |
424 |
- if test "$have_guile" = yes; then |
425 |
---- make-4.2.1/configure.ac 2016-06-06 14:27:31.000000000 +0200 |
426 |
-+++ make-4.2.1/configure.ac 2016-06-06 14:27:31.000000000 +0200 |
427 |
-@@ -160,22 +160,28 @@ |
428 |
- AC_FUNC_CLOSEDIR_VOID |
429 |
- |
430 |
- # See if the user wants to add (or not) GNU Guile support |
431 |
--PKG_PROG_PKG_CONFIG |
432 |
- AC_ARG_WITH([guile], [AS_HELP_STRING([--with-guile], |
433 |
- [Support GNU Guile for embedded scripting])]) |
434 |
- |
435 |
--# For some strange reason, at least on Ubuntu, each version of Guile |
436 |
--# comes with it's own PC file so we have to specify them as individual |
437 |
--# packages. Ugh. |
438 |
-+# Annoyingly, each version of Guile comes with it's own PC file so we have to |
439 |
-+# specify them as individual packages. Ugh. |
440 |
-+PKG_PROG_PKG_CONFIG |
441 |
-+ |
442 |
- AS_IF([test "x$with_guile" != xno], |
443 |
--[ PKG_CHECK_MODULES([GUILE], [guile-2.0], [have_guile=yes], |
444 |
-- [PKG_CHECK_MODULES([GUILE], [guile-1.8], [have_guile=yes], |
445 |
-- [have_guile=no])]) |
446 |
-+[ guile_versions="2.2 2.0 1.8" |
447 |
-+ guile_version=no |
448 |
-+ have_guile=no |
449 |
-+ AC_MSG_CHECKING([for GNU Guile]) |
450 |
-+ for v in $guile_versions; do |
451 |
-+ PKG_CHECK_EXISTS([guile-$v], [guile_version=$v; have_guile=yes; break], []) |
452 |
-+ done |
453 |
-+ AC_MSG_RESULT([$guile_version]) |
454 |
-+ if test "$have_guile" = yes; then |
455 |
-+ PKG_CHECK_MODULES(GUILE, [guile-$guile_version]) |
456 |
-+ AC_DEFINE([HAVE_GUILE], [1], [Embed GNU Guile support]) |
457 |
-+ fi |
458 |
- ]) |
459 |
- |
460 |
--AS_IF([test "$have_guile" = yes], |
461 |
-- [AC_DEFINE([HAVE_GUILE], [1], [Embed GNU Guile support])]) |
462 |
-- |
463 |
- AM_CONDITIONAL([HAVE_GUILE], [test "$have_guile" = yes]) |
464 |
- |
465 |
- AC_FUNC_GETLOADAVG |
466 |
|
467 |
diff --git a/sys-devel/make/files/make-4.2.1-perl526.patch b/sys-devel/make/files/make-4.2.1-perl526.patch |
468 |
deleted file mode 100644 |
469 |
index a935d1314eb..00000000000 |
470 |
--- a/sys-devel/make/files/make-4.2.1-perl526.patch |
471 |
+++ /dev/null |
472 |
@@ -1,26 +0,0 @@ |
473 |
-From d9d4e06084a4c7da480bd49a3487aadf6ba77b54 Mon Sep 17 00:00:00 2001 |
474 |
-From: Enrique Olaizola <enrique_olaizola16@×××××××.com> |
475 |
-Date: Sat, 27 May 2017 14:24:33 -0400 |
476 |
-Subject: [PATCH] * tests/run_make_tests.pl: [SV 50902] Find Perl modules |
477 |
- |
478 |
---- |
479 |
- tests/run_make_tests.pl | 3 +++ |
480 |
- 1 file changed, 3 insertions(+) |
481 |
- |
482 |
-diff --git a/tests/run_make_tests.pl b/tests/run_make_tests.pl |
483 |
-index a74417a..a844094 100644 |
484 |
---- a/tests/run_make_tests.pl |
485 |
-+++ b/tests/run_make_tests.pl |
486 |
-@@ -64,6 +64,9 @@ if ($^O eq 'VMS') |
487 |
- $CMD_rmfile = 'delete_file -no_ask'; |
488 |
- } |
489 |
- |
490 |
-+use FindBin; |
491 |
-+use lib "$FindBin::Bin"; |
492 |
-+ |
493 |
- require "test_driver.pl"; |
494 |
- require "config-flags.pm"; |
495 |
- |
496 |
--- |
497 |
-2.16.1 |
498 |
- |
499 |
|
500 |
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 |
501 |
deleted file mode 100644 |
502 |
index 61e19516f3c..00000000000 |
503 |
--- a/sys-devel/make/files/make-4.2.1-pselect-non-blocking.patch |
504 |
+++ /dev/null |
505 |
@@ -1,172 +0,0 @@ |
506 |
-https://bugs.gentoo.org/664632 |
507 |
- |
508 |
-From b552b05251980f693c729e251f93f5225b400714 Mon Sep 17 00:00:00 2001 |
509 |
-From: Paul Smith <psmith@×××.org> |
510 |
-Date: Sat, 3 Jun 2017 16:20:51 -0400 |
511 |
-Subject: [SV 51159] Use a non-blocking read with pselect to avoid hangs. |
512 |
- |
513 |
-* posixos.c (set_blocking): Set blocking on a file descriptor. |
514 |
-(jobserver_setup): Set non-blocking on the jobserver read side. |
515 |
-(jobserver_parse_auth): Ditto. |
516 |
-(jobserver_acquire_all): Set blocking to avoid a busy-wait loop. |
517 |
-(jobserver_acquire): If the non-blocking read() returns without |
518 |
-taking a token then try again. |
519 |
---- |
520 |
- posixos.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++----------------- |
521 |
- 1 file changed, 71 insertions(+), 26 deletions(-) |
522 |
- |
523 |
-diff --git a/posixos.c b/posixos.c |
524 |
-index e642d7f..dbafa51 100644 |
525 |
---- a/posixos.c |
526 |
-+++ b/posixos.c |
527 |
-@@ -62,6 +62,24 @@ make_job_rfd (void) |
528 |
- #endif |
529 |
- } |
530 |
- |
531 |
-+static void |
532 |
-+set_blocking (int fd, int blocking) |
533 |
-+{ |
534 |
-+ // If we're not using pselect() don't change the blocking |
535 |
-+#ifdef HAVE_PSELECT |
536 |
-+ int flags; |
537 |
-+ EINTRLOOP (flags, fcntl (fd, F_GETFL)); |
538 |
-+ if (flags >= 0) |
539 |
-+ { |
540 |
-+ int r; |
541 |
-+ flags = blocking ? (flags & ~O_NONBLOCK) : (flags | O_NONBLOCK); |
542 |
-+ EINTRLOOP (r, fcntl (fd, F_SETFL, flags)); |
543 |
-+ if (r < 0) |
544 |
-+ pfatal_with_name ("fcntl(O_NONBLOCK)"); |
545 |
-+ } |
546 |
-+#endif |
547 |
-+} |
548 |
-+ |
549 |
- unsigned int |
550 |
- jobserver_setup (int slots) |
551 |
- { |
552 |
-@@ -86,6 +104,9 @@ jobserver_setup (int slots) |
553 |
- pfatal_with_name (_("init jobserver pipe")); |
554 |
- } |
555 |
- |
556 |
-+ /* When using pselect() we want the read to be non-blocking. */ |
557 |
-+ set_blocking (job_fds[0], 0); |
558 |
-+ |
559 |
- return 1; |
560 |
- } |
561 |
- |
562 |
-@@ -121,6 +142,9 @@ jobserver_parse_auth (const char *auth) |
563 |
- return 0; |
564 |
- } |
565 |
- |
566 |
-+ /* When using pselect() we want the read to be non-blocking. */ |
567 |
-+ set_blocking (job_fds[0], 0); |
568 |
-+ |
569 |
- return 1; |
570 |
- } |
571 |
- |
572 |
-@@ -169,7 +193,10 @@ jobserver_acquire_all (void) |
573 |
- { |
574 |
- unsigned int tokens = 0; |
575 |
- |
576 |
-- /* Close the write side, so the read() won't hang. */ |
577 |
-+ /* Use blocking reads to wait for all outstanding jobs. */ |
578 |
-+ set_blocking (job_fds[0], 1); |
579 |
-+ |
580 |
-+ /* Close the write side, so the read() won't hang forever. */ |
581 |
- close (job_fds[1]); |
582 |
- job_fds[1] = -1; |
583 |
- |
584 |
-@@ -236,18 +263,12 @@ jobserver_pre_acquire (void) |
585 |
- unsigned int |
586 |
- jobserver_acquire (int timeout) |
587 |
- { |
588 |
-- sigset_t empty; |
589 |
-- fd_set readfds; |
590 |
- struct timespec spec; |
591 |
- struct timespec *specp = NULL; |
592 |
-- int r; |
593 |
-- char intake; |
594 |
-+ sigset_t empty; |
595 |
- |
596 |
- sigemptyset (&empty); |
597 |
- |
598 |
-- FD_ZERO (&readfds); |
599 |
-- FD_SET (job_fds[0], &readfds); |
600 |
-- |
601 |
- if (timeout) |
602 |
- { |
603 |
- /* Alarm after one second (is this too granular?) */ |
604 |
-@@ -256,28 +277,52 @@ jobserver_acquire (int timeout) |
605 |
- specp = &spec; |
606 |
- } |
607 |
- |
608 |
-- r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty); |
609 |
-- |
610 |
-- if (r == -1) |
611 |
-+ while (1) |
612 |
- { |
613 |
-- /* Better be SIGCHLD. */ |
614 |
-- if (errno != EINTR) |
615 |
-- pfatal_with_name (_("pselect jobs pipe")); |
616 |
-- return 0; |
617 |
-- } |
618 |
-+ fd_set readfds; |
619 |
-+ int r; |
620 |
-+ char intake; |
621 |
- |
622 |
-- if (r == 0) |
623 |
-- /* Timeout. */ |
624 |
-- return 0; |
625 |
-+ FD_ZERO (&readfds); |
626 |
-+ FD_SET (job_fds[0], &readfds); |
627 |
- |
628 |
-- /* The read FD is ready: read it! */ |
629 |
-- EINTRLOOP (r, read (job_fds[0], &intake, 1)); |
630 |
-- if (r < 0) |
631 |
-- pfatal_with_name (_("read jobs pipe")); |
632 |
-+ r = pselect (job_fds[0]+1, &readfds, NULL, NULL, specp, &empty); |
633 |
-+ if (r < 0) |
634 |
-+ switch (errno) |
635 |
-+ { |
636 |
-+ case EINTR: |
637 |
-+ /* SIGCHLD will show up as an EINTR. */ |
638 |
-+ return 0; |
639 |
-+ |
640 |
-+ case EBADF: |
641 |
-+ /* Someone closed the jobs pipe. |
642 |
-+ That shouldn't happen but if it does we're done. */ |
643 |
-+ O (fatal, NILF, _("job server shut down")); |
644 |
- |
645 |
-- /* What does it mean if read() returns 0? It shouldn't happen because only |
646 |
-- the master make can reap all the tokens and close the write side...?? */ |
647 |
-- return r > 0; |
648 |
-+ default: |
649 |
-+ pfatal_with_name (_("pselect jobs pipe")); |
650 |
-+ } |
651 |
-+ |
652 |
-+ if (r == 0) |
653 |
-+ /* Timeout. */ |
654 |
-+ return 0; |
655 |
-+ |
656 |
-+ /* The read FD is ready: read it! This is non-blocking. */ |
657 |
-+ EINTRLOOP (r, read (job_fds[0], &intake, 1)); |
658 |
-+ |
659 |
-+ if (r < 0) |
660 |
-+ { |
661 |
-+ /* Someone sniped our token! Try again. */ |
662 |
-+ if (errno == EAGAIN) |
663 |
-+ continue; |
664 |
-+ |
665 |
-+ pfatal_with_name (_("read jobs pipe")); |
666 |
-+ } |
667 |
-+ |
668 |
-+ /* read() should never return 0: only the master make can reap all the |
669 |
-+ tokens and close the write side...?? */ |
670 |
-+ return r > 0; |
671 |
-+ } |
672 |
- } |
673 |
- |
674 |
- #else |
675 |
--- |
676 |
-cgit v1.0-41-gc330 |
677 |
- |
678 |
|
679 |
diff --git a/sys-devel/make/make-4.2.1-r4.ebuild b/sys-devel/make/make-4.2.1-r4.ebuild |
680 |
deleted file mode 100644 |
681 |
index d5fead12467..00000000000 |
682 |
--- a/sys-devel/make/make-4.2.1-r4.ebuild |
683 |
+++ /dev/null |
684 |
@@ -1,59 +0,0 @@ |
685 |
-# Copyright 1999-2021 Gentoo Authors |
686 |
-# Distributed under the terms of the GNU General Public License v2 |
687 |
- |
688 |
-EAPI="6" |
689 |
- |
690 |
-inherit flag-o-matic |
691 |
- |
692 |
-DESCRIPTION="Standard tool to compile source trees" |
693 |
-HOMEPAGE="https://www.gnu.org/software/make/make.html" |
694 |
-SRC_URI="mirror://gnu//make/${P}.tar.bz2" |
695 |
- |
696 |
-LICENSE="GPL-3+" |
697 |
-SLOT="0" |
698 |
-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" |
699 |
-IUSE="guile nls static" |
700 |
- |
701 |
-CDEPEND="guile? ( >=dev-scheme/guile-1.8:= )" |
702 |
-DEPEND="${CDEPEND} |
703 |
- nls? ( sys-devel/gettext )" |
704 |
-RDEPEND="${CDEPEND} |
705 |
- nls? ( virtual/libintl )" |
706 |
- |
707 |
-PATCHES=( |
708 |
- "${FILESDIR}"/${PN}-3.82-darwin-library_search-dylib.patch |
709 |
- "${FILESDIR}"/${PN}-4.2-default-cxx.patch |
710 |
- "${FILESDIR}"/${PN}-4.2.1-perl526.patch |
711 |
- "${FILESDIR}"/${PN}-4.2.1-glob-internals.patch |
712 |
- "${FILESDIR}"/${PN}-4.2.1-pselect-non-blocking.patch |
713 |
-) |
714 |
- |
715 |
-src_prepare() { |
716 |
- default |
717 |
- # These patches require special handling as they modify configure.ac |
718 |
- # which in turn triggers maintainer-mode when being applied the |
719 |
- # usual way. |
720 |
- eapply -Z "${FILESDIR}"/${PN}-4.2.1-glob-v2.patch \ |
721 |
- "${FILESDIR}"/${P}-guile-2.2.patch |
722 |
-} |
723 |
- |
724 |
-src_configure() { |
725 |
- use static && append-ldflags -static |
726 |
- local myeconfargs=( |
727 |
- --program-prefix=g |
728 |
- $(use_with guile) |
729 |
- $(use_enable nls) |
730 |
- ) |
731 |
- econf "${myeconfargs[@]}" |
732 |
-} |
733 |
- |
734 |
-src_install() { |
735 |
- emake DESTDIR="${D}" install |
736 |
- dodoc AUTHORS NEWS README* |
737 |
- if [[ ${USERLAND} == "GNU" ]] ; then |
738 |
- # we install everywhere as 'gmake' but on GNU systems, |
739 |
- # symlink 'make' to 'gmake' |
740 |
- dosym gmake /usr/bin/make |
741 |
- dosym gmake.1 /usr/share/man/man1/make.1 |
742 |
- fi |
743 |
-} |