Accepting request 213959 from Base:System
- Update to 4.0 * see details in NEWS and ChangeLog files * Bugfixes, a complete list of bugs fixed in this version is available here http://sv.gnu.org/bugs/index.php?group=make&report_id=111&fix_release_id=101&set=custom * WARNING: Backward-incompatibility! backslash/newline handling * New feature: GNU Guile integration * New command line option: --output-sync (-O) enables grouping of output by target or by recursive make. * New command line option: --trace enables tracing of targets. * New command line option argument: --debug now accepts a "n" (none) flag which disables all debugging settings that are currently enabled. * New feature: The "job server" capability is now supported on Windows. * New feature: The .ONESHELL capability is now supported on Windows. * New feature: "!=" shell assignment operator as an alternative to the $(shell ...) function. Implemented for compatibility with BSD makefiles. * New feature: "::=" simple assignment operator as defined by POSIX in 2012. * New feature: Loadable objects * New function: $(file ...) writes to a file. * New variable: $(GNUMAKEFLAGS) will be parsed for make flags, just like MAKEFLAGS is. It can be set in the environment or the makefile, containing GNU make-specific flags to allow your makefile to be portable to other versions of make. * New variable: `MAKE_HOST' gives the name of the host architecture make was compiled for. OBS-URL: https://build.opensuse.org/request/show/213959 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/make?expand=0&rev=30
This commit is contained in:
commit
6ebe42ac1d
@ -1,45 +0,0 @@
|
||||
diff --git a/read.c b/read.c
|
||||
index 8587e85..370009d 100644
|
||||
--- a/read.c
|
||||
+++ b/read.c
|
||||
@@ -3047,16 +3047,16 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar,
|
||||
nlen -= (n + 1) - tp;
|
||||
tp = n + 1;
|
||||
|
||||
- /* If we have just "lib(", part of something like
|
||||
- "lib( a b)", go to the next item. */
|
||||
- if (! nlen)
|
||||
- continue;
|
||||
-
|
||||
/* We can stop looking now. */
|
||||
break;
|
||||
}
|
||||
}
|
||||
while (*e != '\0');
|
||||
+
|
||||
+ /* If we have just "lib(", part of something like "lib( a b)",
|
||||
+ go to the next item. */
|
||||
+ if (! nlen)
|
||||
+ continue;
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/tests/scripts/features/archives b/tests/scripts/features/archives
|
||||
index 00aa1af..3fe46a0 100644
|
||||
--- a/tests/scripts/features/archives
|
||||
+++ b/tests/scripts/features/archives
|
||||
@@ -36,6 +36,11 @@ utouch(-50, 'a2.o');
|
||||
run_make_test('all: libxx.a(a3.o *.o)', '',
|
||||
"ar rv libxx.a a3.o\na - a3.o\nar rv libxx.a a2.o\nr - a2.o\n");
|
||||
|
||||
+# Check whitespace handling
|
||||
+utouch(-40, 'a2.o');
|
||||
+run_make_test('all: libxx.a( a3.o *.o )', '',
|
||||
+ "ar rv libxx.a a2.o\nr - a2.o\n");
|
||||
+
|
||||
rmfiles(qw(a1.o a2.o a3.o libxx.a));
|
||||
|
||||
# This tells the test driver that the perl test script executed properly.
|
||||
--
|
||||
1.8.4
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e2c1a73f179c40c71e2fe8abf8a8a0688b8499538512984da4a76958d0402966
|
||||
size 1242186
|
Binary file not shown.
3
make-4.0.tar.bz2
Normal file
3
make-4.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e60686c7afede62cc8c86ad3012cf081ea4887daf9d223ce7115703b2bb2dbdb
|
||||
size 1341927
|
BIN
make-4.0.tar.bz2.sig
Normal file
BIN
make-4.0.tar.bz2.sig
Normal file
Binary file not shown.
@ -1,106 +0,0 @@
|
||||
Index: make-3.82/configure.in
|
||||
===================================================================
|
||||
--- make-3.82.orig/configure.in
|
||||
+++ make-3.82/configure.in
|
||||
@@ -64,7 +64,8 @@ AC_HEADER_DIRENT
|
||||
AC_HEADER_STAT
|
||||
AC_HEADER_TIME
|
||||
AC_CHECK_HEADERS(stdlib.h locale.h unistd.h limits.h fcntl.h string.h \
|
||||
- memory.h sys/param.h sys/resource.h sys/time.h sys/timeb.h)
|
||||
+ memory.h sys/param.h sys/resource.h sys/time.h sys/timeb.h \
|
||||
+ sys/user.h linux/binfmts.h)
|
||||
|
||||
# Set a flag if we have an ANSI C compiler
|
||||
if test "$ac_cv_prog_cc_stdc" != no; then
|
||||
Index: make-3.82/job.c
|
||||
===================================================================
|
||||
--- make-3.82.orig/job.c
|
||||
+++ make-3.82/job.c
|
||||
@@ -29,6 +29,14 @@ this program. If not, see <http://www.g
|
||||
|
||||
#include <string.h>
|
||||
|
||||
+#if defined (HAVE_LINUX_BINFMTS_H) && defined (HAVE_SYS_USER_H)
|
||||
+#include <sys/user.h>
|
||||
+#include <linux/binfmts.h>
|
||||
+#ifndef PAGE_SIZE
|
||||
+#define PAGE_SIZE getpagesize()
|
||||
+#endif
|
||||
+#endif
|
||||
+
|
||||
/* Default shell to use. */
|
||||
#ifdef WINDOWS32
|
||||
#include <windows.h>
|
||||
@@ -2795,6 +2803,7 @@ construct_command_argv_internal (char *l
|
||||
unsigned int sflags_len = strlen (shellflags);
|
||||
char *command_ptr = NULL; /* used for batch_mode_shell mode */
|
||||
char *new_line;
|
||||
+ char *args_ptr;
|
||||
|
||||
# ifdef __EMX__ /* is this necessary? */
|
||||
if (!unixy_shell)
|
||||
@@ -2865,8 +2874,17 @@ construct_command_argv_internal (char *l
|
||||
return new_argv;
|
||||
}
|
||||
|
||||
+#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
|
||||
+
|
||||
new_line = alloca (shell_len + 1 + sflags_len + 1
|
||||
- + (line_len*2) + 1);
|
||||
+ + (line_len*2) + 1 + EVAL_LEN);
|
||||
ap = new_line;
|
||||
memcpy (ap, shell, shell_len);
|
||||
ap += shell_len;
|
||||
@@ -2875,6 +2893,30 @@ construct_command_argv_internal (char *l
|
||||
ap += sflags_len;
|
||||
*(ap++) = ' ';
|
||||
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')
|
||||
@@ -2922,6 +2964,14 @@ construct_command_argv_internal (char *l
|
||||
}
|
||||
#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 + sflags_len + 2)
|
||||
/* Line was empty. */
|
@ -1,141 +0,0 @@
|
||||
Index: make-3.82/tests/scripts/targets/SECONDARY
|
||||
===================================================================
|
||||
--- make-3.82.orig/tests/scripts/targets/SECONDARY
|
||||
+++ make-3.82/tests/scripts/targets/SECONDARY
|
||||
@@ -121,69 +121,73 @@ all: version2',
|
||||
|
||||
unlink('version2');
|
||||
|
||||
-# TEST #9 -- Savannah bug #15919
|
||||
-# The original fix for this bug caused a new bug, shown here.
|
||||
-
|
||||
-touch(qw(1.a 2.a));
|
||||
-
|
||||
-run_make_test('
|
||||
-%.c : %.b ; cp $< $@
|
||||
-%.b : %.a ; cp $< $@
|
||||
-all : 1.c 2.c', '-rR -j',
|
||||
-'cp 1.a 1.b
|
||||
-cp 2.a 2.b
|
||||
-cp 1.b 1.c
|
||||
-cp 2.b 2.c
|
||||
-rm 1.b 2.b');
|
||||
-
|
||||
-unlink(qw(1.a 2.a 1.c 2.c));
|
||||
-
|
||||
-# TEST #10 -- Savannah bug #15919
|
||||
-touch('test.0');
|
||||
-run_make_test('
|
||||
-.SECONDARY : test.1 test.2 test.3
|
||||
-
|
||||
-test : test.4
|
||||
-
|
||||
-%.4 : %.int %.3 ; touch $@
|
||||
-
|
||||
-%.int : %.3 %.2 ; touch $@
|
||||
-
|
||||
-%.3 : | %.2 ; touch $@
|
||||
-
|
||||
-%.2 : %.1 ; touch $@
|
||||
-
|
||||
-%.1 : %.0 ; touch $@', '-rR -j 2',
|
||||
-'touch test.1
|
||||
-touch test.2
|
||||
-touch test.3
|
||||
-touch test.int
|
||||
-touch test.4
|
||||
-rm test.int');
|
||||
-
|
||||
-# After a touch of test.0 it should give the same output, except we don't need
|
||||
-# to rebuild test.3 (order-only)
|
||||
-sleep(1);
|
||||
-touch('test.0');
|
||||
-run_make_test(undef, '-rR -j 2',
|
||||
-'touch test.1
|
||||
-touch test.2
|
||||
-touch test.int
|
||||
-touch test.4
|
||||
-rm test.int');
|
||||
-
|
||||
-# With both test.0 and test.3 updated it should still build everything except
|
||||
-# test.3
|
||||
-sleep(1);
|
||||
-touch('test.0', 'test.3');
|
||||
-run_make_test(undef, '-rR -j 2',
|
||||
-'touch test.1
|
||||
-touch test.2
|
||||
-touch test.int
|
||||
-touch test.4
|
||||
-rm test.int');
|
||||
-
|
||||
-unlink(qw(test.0 test.1 test.2 test.3 test.4));
|
||||
+# All these tests don't reliably work under high load conditions.
|
||||
+# Heck, I had two different failures on my workstation, and it's
|
||||
+# perfectly clear that ordering can differ. - mhopf
|
||||
+
|
||||
+# # TEST #9 -- Savannah bug #15919
|
||||
+# # The original fix for this bug caused a new bug, shown here.
|
||||
+#
|
||||
+# touch(qw(1.a 2.a));
|
||||
+#
|
||||
+# run_make_test('
|
||||
+# %.c : %.b ; cp $< $@
|
||||
+# %.b : %.a ; cp $< $@
|
||||
+# all : 1.c 2.c', '-rR -j',
|
||||
+# 'cp 1.a 1.b
|
||||
+# cp 2.a 2.b
|
||||
+# cp 1.b 1.c
|
||||
+# cp 2.b 2.c
|
||||
+# rm 1.b 2.b');
|
||||
+#
|
||||
+# unlink(qw(1.a 2.a 1.c 2.c));
|
||||
+#
|
||||
+# # TEST #10 -- Savannah bug #15919
|
||||
+# touch('test.0');
|
||||
+# run_make_test('
|
||||
+# .SECONDARY : test.1 test.2 test.3
|
||||
+#
|
||||
+# test : test.4
|
||||
+#
|
||||
+# %.4 : %.int %.3 ; touch $@
|
||||
+#
|
||||
+# %.int : %.3 %.2 ; touch $@
|
||||
+#
|
||||
+# %.3 : | %.2 ; touch $@
|
||||
+#
|
||||
+# %.2 : %.1 ; touch $@
|
||||
+#
|
||||
+# %.1 : %.0 ; touch $@', '-rR -j 2',
|
||||
+# 'touch test.1
|
||||
+# touch test.2
|
||||
+# touch test.3
|
||||
+# touch test.int
|
||||
+# touch test.4
|
||||
+# rm test.int');
|
||||
+#
|
||||
+# # After a touch of test.0 it should give the same output, except we don't need
|
||||
+# # to rebuild test.3 (order-only)
|
||||
+# sleep(1);
|
||||
+# touch('test.0');
|
||||
+# run_make_test(undef, '-rR -j 2',
|
||||
+# 'touch test.1
|
||||
+# touch test.2
|
||||
+# touch test.int
|
||||
+# touch test.4
|
||||
+# rm test.int');
|
||||
+#
|
||||
+# # With both test.0 and test.3 updated it should still build everything except
|
||||
+# # test.3
|
||||
+# sleep(1);
|
||||
+# touch('test.0', 'test.3');
|
||||
+# run_make_test(undef, '-rR -j 2',
|
||||
+# 'touch test.1
|
||||
+# touch test.2
|
||||
+# touch test.int
|
||||
+# touch test.4
|
||||
+# rm test.int');
|
||||
+#
|
||||
+# unlink(qw(test.0 test.1 test.2 test.3 test.4));
|
||||
|
||||
# This tells the test driver that the perl test script executed properly.
|
||||
1;
|
@ -1,30 +0,0 @@
|
||||
Index: make-3.82/function.c
|
||||
===================================================================
|
||||
--- make-3.82.orig/function.c
|
||||
+++ make-3.82/function.c
|
||||
@@ -1133,19 +1133,14 @@ func_sort (char *o, char **argv, const c
|
||||
|
||||
/* 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, &len)) != 0)
|
||||
{
|
||||
- char c = *(t++);
|
||||
-
|
||||
- if (! isspace ((unsigned char)c))
|
||||
- continue;
|
||||
-
|
||||
- ++wordi;
|
||||
-
|
||||
- while (isspace ((unsigned char)*t))
|
||||
- ++t;
|
||||
+ ++t;
|
||||
+ wordi++;
|
||||
}
|
||||
+ if (! wordi)
|
||||
+ wordi = 1;
|
||||
|
||||
words = xmalloc (wordi * sizeof (char *));
|
||||
|
@ -1,116 +0,0 @@
|
||||
Index: read.c
|
||||
===================================================================
|
||||
RCS file: /sources/make/make/read.c,v
|
||||
retrieving revision 1.198
|
||||
retrieving revision 1.200
|
||||
diff -u -p -u -r1.198 -r1.200
|
||||
--- read.c 29 Apr 2011 15:27:39 -0000 1.198
|
||||
+++ read.c 7 May 2011 14:36:12 -0000 1.200
|
||||
@@ -2901,6 +2901,7 @@ parse_file_seq (char **stringp, unsigned
|
||||
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 @@ parse_file_seq (char **stringp, unsigned
|
||||
}
|
||||
#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 @@ parse_file_seq (char **stringp, unsigned
|
||||
#endif /* !NO_ARCHIVES */
|
||||
NEWELT (concat (2, prefix, nlist[i]));
|
||||
|
||||
- globfree (&gl);
|
||||
+ if (globme)
|
||||
+ globfree (&gl);
|
||||
|
||||
#ifndef NO_ARCHIVES
|
||||
if (arname)
|
||||
Index: tests/scripts/functions/wildcard
|
||||
===================================================================
|
||||
RCS file: /sources/make/make/tests/scripts/functions/wildcard,v
|
||||
retrieving revision 1.6
|
||||
retrieving revision 1.7
|
||||
diff -u -p -u -r1.6 -r1.7
|
||||
--- tests/scripts/functions/wildcard 13 Jun 2009 21:21:49 -0000 1.6
|
||||
+++ tests/scripts/functions/wildcard 7 May 2011 14:36:11 -0000 1.7
|
||||
@@ -88,4 +88,16 @@ all: ; @echo $(wildcard xz--y*.7)
|
||||
!,
|
||||
'', "\n");
|
||||
|
||||
+# TEST #5: wildcard used to verify file existence
|
||||
+
|
||||
+touch('xxx.yyy');
|
||||
+
|
||||
+run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
|
||||
+ '', "file=xxx.yyy\n");
|
||||
+
|
||||
+unlink('xxx.yyy');
|
||||
+
|
||||
+run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
|
||||
+ '', "file=\n");
|
||||
+
|
||||
1;
|
@ -1,27 +0,0 @@
|
||||
diff -u make-3.82-orig/remake.c make-3.82/remake.c
|
||||
--- make-3.82-orig/remake.c 2010-07-13 03:20:42.000000000 +0200
|
||||
+++ make-3.82/remake.c 2012-03-21 12:47:52.000000000 +0100
|
||||
@@ -301,7 +301,7 @@
|
||||
/* Check for the case where a target has been tried and failed but
|
||||
the diagnostics hasn't been issued. If we need the diagnostics
|
||||
then we will have to continue. */
|
||||
- if (!(f->updated && f->update_status > 0 && !f->dontcare && f->no_diag))
|
||||
+ if (!(f->updated && f->update_status > 0 && !f->dontcare && f->no_diag) && f->command_state!=cs_not_started )
|
||||
{
|
||||
DBF (DB_VERBOSE, _("Pruning file `%s'.\n"));
|
||||
return f->command_state == cs_finished ? f->update_status : 0;
|
||||
@@ -614,6 +614,12 @@
|
||||
d->file->dontcare = file->dontcare;
|
||||
}
|
||||
|
||||
+ /* We may have already encountered this file earlier in the same
|
||||
+ * pass before we knew we'd be updating this target. In that
|
||||
+ * case calling update_file now would result in the file being
|
||||
+ * inappropriately pruned so we toggle the considered bit back
|
||||
+ * off first. */
|
||||
+ d->file->considered = !considered;
|
||||
|
||||
dep_status |= update_file (d->file, depth);
|
||||
|
||||
|
||||
|
@ -1,235 +0,0 @@
|
||||
Index: ChangeLog
|
||||
===================================================================
|
||||
RCS file: /sources/make/make/ChangeLog,v
|
||||
retrieving revision 2.419
|
||||
retrieving revision 2.420
|
||||
diff -u -p -u -p -r2.419 -r2.420
|
||||
--- ChangeLog 10 Aug 2010 07:35:34 -0000 2.419
|
||||
+++ ChangeLog 14 Aug 2010 02:50:14 -0000 2.420
|
||||
@@ -1,3 +1,17 @@
|
||||
+2010-08-13 Paul Smith <psmith@gnu.org>
|
||||
+
|
||||
+ * NEWS: Accidentally forgot to back out the sorted wildcard
|
||||
+ enhancement in 3.82, so update NEWS.
|
||||
+ Also add NEWS about the error check for explicit and pattern
|
||||
+ targets in the same rule, added to 3.82.
|
||||
+
|
||||
+ * main.c (main): Add "oneshell" to $(.FEATURES) (forgot to add
|
||||
+ this in 3.82!)
|
||||
+
|
||||
+ * read.c (parse_file_seq): Fix various errors parsing archives
|
||||
+ with multiple objects in the parenthesis, as well as wildcards.
|
||||
+ Fixes Savannah bug #30612.
|
||||
+
|
||||
2010-08-10 Paul Smith <psmith@gnu.org>
|
||||
|
||||
* main.c (main): Expand MAKEFLAGS before adding it to the
|
||||
Index: NEWS
|
||||
===================================================================
|
||||
RCS file: /sources/make/make/NEWS,v
|
||||
retrieving revision 2.109
|
||||
retrieving revision 2.110
|
||||
diff -u -p -u -p -r2.109 -r2.110
|
||||
--- NEWS 28 Jul 2010 05:39:50 -0000 2.109
|
||||
+++ NEWS 14 Aug 2010 02:50:14 -0000 2.110
|
||||
@@ -18,14 +18,6 @@ http://sv.gnu.org/bugs/index.php?group=m
|
||||
* Compiling GNU make now requires a conforming ISO C 1989 compiler and
|
||||
standard runtime library.
|
||||
|
||||
-* WARNING: Future backward-incompatibility!
|
||||
- Wildcards are not documented as returning sorted values, but up to and
|
||||
- including this release the results have been sorted and some makefiles are
|
||||
- apparently depending on that. In the next release of GNU make, for
|
||||
- performance reasons, we may remove that sorting. If your makefiles
|
||||
- require sorted results from wildcard expansions, use the $(sort ...)
|
||||
- function to request it explicitly.
|
||||
-
|
||||
* WARNING: Backward-incompatibility!
|
||||
The POSIX standard for make was changed in the 2008 version in a
|
||||
fundamentally incompatible way: make is required to invoke the shell as if
|
||||
@@ -42,6 +34,21 @@ http://sv.gnu.org/bugs/index.php?group=m
|
||||
existing targets were provided in $?).
|
||||
|
||||
* WARNING: Backward-incompatibility!
|
||||
+ Wildcards were not documented as returning sorted values, but the results
|
||||
+ have been sorted up until this release.. If your makefiles require sorted
|
||||
+ results from wildcard expansions, use the $(sort ...) function to request
|
||||
+ it explicitly.
|
||||
+
|
||||
+* WARNING: Backward-incompatibility!
|
||||
+ In previous versions of make it was acceptable to list one or more explicit
|
||||
+ targets followed by one or more pattern targets in the same rule and it
|
||||
+ worked "as expected". However, this was not documented as acceptable and if
|
||||
+ you listed any explicit targets AFTER the pattern targets, the entire rule
|
||||
+ would be mis-parsed. This release removes this ability completely: make
|
||||
+ will generate an error message if you mix explicit and pattern targets in
|
||||
+ the same rule.
|
||||
+
|
||||
+* WARNING: Backward-incompatibility!
|
||||
As a result of parser enhancements, three backward-compatibility issues
|
||||
exist: first, a prerequisite containing an "=" cannot be escaped with a
|
||||
backslash any longer. You must create a variable containing an "=" and
|
||||
Index: main.c
|
||||
===================================================================
|
||||
RCS file: /sources/make/make/main.c,v
|
||||
retrieving revision 1.244
|
||||
retrieving revision 1.245
|
||||
diff -u -p -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
|
||||
Index: read.c
|
||||
===================================================================
|
||||
RCS file: /sources/make/make/read.c,v
|
||||
retrieving revision 1.193
|
||||
retrieving revision 1.194
|
||||
diff -u -p -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)
|
||||
Index: tests/ChangeLog
|
||||
===================================================================
|
||||
RCS file: /sources/make/make/tests/ChangeLog,v
|
||||
retrieving revision 1.150
|
||||
retrieving revision 1.151
|
||||
diff -u -p -u -p -r1.150 -r1.151
|
||||
--- tests/ChangeLog 10 Aug 2010 07:35:34 -0000 1.150
|
||||
+++ tests/ChangeLog 14 Aug 2010 02:50:14 -0000 1.151
|
||||
@@ -1,3 +1,11 @@
|
||||
+2010-08-13 Paul Smith <psmith@gnu.org>
|
||||
+
|
||||
+ * scripts/features/archives: New regression tests for archive
|
||||
+ support. Test for fix to Savannah bug #30612.
|
||||
+
|
||||
+ * run_make_tests.pl (set_more_defaults): Set a %FEATURES hash to
|
||||
+ the features available in $(.FEATURES).
|
||||
+
|
||||
2010-08-10 Paul Smith <psmith@gnu.org>
|
||||
|
||||
* scripts/features/reinvoke: Ensure command line variable settings
|
||||
Index: tests/run_make_tests.pl
|
||||
===================================================================
|
||||
RCS file: /sources/make/make/tests/run_make_tests.pl,v
|
||||
retrieving revision 1.32
|
||||
retrieving revision 1.33
|
||||
diff -u -p -u -p -r1.32 -r1.33
|
||||
--- tests/run_make_tests.pl 13 Jul 2010 01:20:43 -0000 1.32
|
||||
+++ tests/run_make_tests.pl 14 Aug 2010 02:50:14 -0000 1.33
|
||||
@@ -29,6 +29,7 @@
|
||||
# You should have received a copy of the GNU General Public License along with
|
||||
# this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
+%FEATURES = ();
|
||||
|
||||
$valgrind = 0; # invoke make with valgrind
|
||||
$valgrind_args = '';
|
||||
@@ -367,6 +368,8 @@ sub set_more_defaults
|
||||
$parallel_jobs = 1;
|
||||
}
|
||||
|
||||
+ %FEATURES = map { $_ => 1 } split /\s+/, `sh -c "echo '\\\$(info \\\$(.FEATURES))' | $make_path -f- 2>/dev/null"`;
|
||||
+
|
||||
# Set up for valgrind, if requested.
|
||||
|
||||
if ($valgrind) {
|
||||
Index: tests/scripts/features/archives
|
||||
===================================================================
|
||||
RCS file: tests/scripts/features/archives
|
||||
diff -N tests/scripts/features/archives
|
||||
--- /dev/null 1 Jan 1970 00:00:00 -0000
|
||||
+++ tests/scripts/features/archives 14 Aug 2010 02:50:14 -0000 1.1
|
||||
@@ -0,0 +1,42 @@
|
||||
+# -*-mode: perl-*-
|
||||
+
|
||||
+$description = "Test GNU make's archive management features.";
|
||||
+
|
||||
+$details = "\
|
||||
+This only works on systems that support it.";
|
||||
+
|
||||
+# If this instance of make doesn't support archives, skip it
|
||||
+exists $FEATURES{archives} or return -1;
|
||||
+
|
||||
+# Create some .o files to work with
|
||||
+utouch(-60, qw(a1.o a2.o a3.o));
|
||||
+
|
||||
+# Very simple
|
||||
+run_make_test('all: libxx.a(a1.o)',
|
||||
+ '', "ar rv libxx.a a1.o\nar: creating libxx.a\na - a1.o\n");
|
||||
+
|
||||
+# Multiple .o's. Add a new one to the existing library
|
||||
+run_make_test('all: libxx.a(a1.o a2.o)',
|
||||
+ '', "ar rv libxx.a a2.o\na - a2.o\n");
|
||||
+
|
||||
+# Touch one of the .o's so it's rebuilt
|
||||
+utouch(-40, 'a1.o');
|
||||
+run_make_test(undef, '', "ar rv libxx.a a1.o\nr - a1.o\n");
|
||||
+
|
||||
+# Use wildcards
|
||||
+run_make_test('all: libxx.a(*.o)',
|
||||
+ '', "#MAKE#: Nothing to be done for `all'.\n");
|
||||
+
|
||||
+# Touch one of the .o's so it's rebuilt
|
||||
+utouch(-30, 'a1.o');
|
||||
+run_make_test(undef, '', "ar rv libxx.a a1.o\nr - a1.o\n");
|
||||
+
|
||||
+# Use both wildcards and simple names
|
||||
+utouch(-50, 'a2.o');
|
||||
+run_make_test('all: libxx.a(a3.o *.o)', '',
|
||||
+ "ar rv libxx.a a3.o\na - a3.o\nar rv libxx.a a2.o\nr - a2.o\n");
|
||||
+
|
||||
+rmfiles(qw(a1.o a2.o a3.o libxx.a));
|
||||
+
|
||||
+# This tells the test driver that the perl test script executed properly.
|
||||
+1;
|
@ -1,85 +0,0 @@
|
||||
Index: ChangeLog
|
||||
===================================================================
|
||||
RCS file: /sources/make/make/ChangeLog,v
|
||||
retrieving revision 2.418
|
||||
retrieving revision 2.419
|
||||
diff -u -p -u -p -r2.418 -r2.419
|
||||
--- ChangeLog 7 Aug 2010 08:55:17 -0000 2.418
|
||||
+++ ChangeLog 10 Aug 2010 07:35:34 -0000 2.419
|
||||
@@ -1,3 +1,8 @@
|
||||
+2010-08-10 Paul Smith <psmith@gnu.org>
|
||||
+
|
||||
+ * main.c (main): Expand MAKEFLAGS before adding it to the
|
||||
+ environment when re-exec'ing. Fixes Savannah bug #30723.
|
||||
+
|
||||
2010-07-28 Paul Smith <psmith@gnu.org>
|
||||
|
||||
Version 3.82 released.
|
||||
Index: main.c
|
||||
===================================================================
|
||||
RCS file: /sources/make/make/main.c,v
|
||||
retrieving revision 1.243
|
||||
retrieving revision 1.244
|
||||
diff -u -p -u -p -r1.243 -r1.244
|
||||
--- main.c 19 Jul 2010 07:10:53 -0000 1.243
|
||||
+++ main.c 10 Aug 2010 07:35:34 -0000 1.244
|
||||
@@ -2093,7 +2093,7 @@ main (int argc, char **argv, char **envp
|
||||
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))
|
||||
Index: tests/ChangeLog
|
||||
===================================================================
|
||||
RCS file: /sources/make/make/tests/ChangeLog,v
|
||||
retrieving revision 1.149
|
||||
retrieving revision 1.150
|
||||
diff -u -p -u -p -r1.149 -r1.150
|
||||
--- tests/ChangeLog 28 Jul 2010 05:39:50 -0000 1.149
|
||||
+++ tests/ChangeLog 10 Aug 2010 07:35:34 -0000 1.150
|
||||
@@ -1,3 +1,8 @@
|
||||
+2010-08-10 Paul Smith <psmith@gnu.org>
|
||||
+
|
||||
+ * scripts/features/reinvoke: Ensure command line variable settings
|
||||
+ are preserved across make re-exec. Tests Savannah bug #30723.
|
||||
+
|
||||
2010-07-28 Paul Smith <psmith@gnu.org>
|
||||
|
||||
* scripts/targets/POSIX: Compatibility issues with Solaris (and
|
||||
Index: tests/scripts/features/reinvoke
|
||||
===================================================================
|
||||
RCS file: /sources/make/make/tests/scripts/features/reinvoke,v
|
||||
retrieving revision 1.7
|
||||
retrieving revision 1.8
|
||||
diff -u -p -u -p -r1.7 -r1.8
|
||||
--- tests/scripts/features/reinvoke 27 Jun 2005 22:18:47 -0000 1.7
|
||||
+++ tests/scripts/features/reinvoke 10 Aug 2010 07:35:34 -0000 1.8
|
||||
@@ -57,9 +57,24 @@ include $(F)',
|
||||
# Now try with the file we're not updating being the actual file we're
|
||||
# including: this and the previous one test different parts of the code.
|
||||
|
||||
-run_make_test(undef, "F=b", "[ -f b ] || echo >> b\nhello\n")
|
||||
+run_make_test(undef, 'F=b', "[ -f b ] || echo >> b\nhello\n")
|
||||
|
||||
&rmfiles('a','b','c');
|
||||
|
||||
+# Ensure command line variables are preserved properly across re-exec
|
||||
+# Tests for Savannah bug #30723
|
||||
+
|
||||
+run_make_test('
|
||||
+ifdef RECURSE
|
||||
+-include foo30723
|
||||
+endif
|
||||
+recurse: ; @$(MAKE) -f $(MAKEFILE_LIST) RECURSE=1 test
|
||||
+test: ; @echo F.O=$(F.O)
|
||||
+foo30723: ; @touch $@
|
||||
+',
|
||||
+ '--no-print-directory F.O=bar', "F.O=bar\n");
|
||||
+
|
||||
+unlink('foo30723');
|
||||
+
|
||||
# This tells the test driver that the perl test script executed properly.
|
||||
1;
|
@ -1,135 +0,0 @@
|
||||
Index: tests/scripts/features/double_colon
|
||||
===================================================================
|
||||
--- tests/scripts/features/double_colon.orig
|
||||
+++ tests/scripts/features/double_colon
|
||||
@@ -23,7 +23,7 @@ all: baz
|
||||
foo:: f1.h ; @echo foo FIRST
|
||||
foo:: f2.h ; @echo foo SECOND
|
||||
|
||||
-bar:: ; @echo aaa; sleep 1; echo aaa done
|
||||
+bar:: ; @echo aaa; sleep 4; echo aaa done
|
||||
bar:: ; @echo bbb
|
||||
|
||||
baz:: ; @echo aaa
|
||||
Index: tests/scripts/features/parallelism
|
||||
===================================================================
|
||||
--- tests/scripts/features/parallelism.orig
|
||||
+++ tests/scripts/features/parallelism
|
||||
@@ -27,9 +27,9 @@ else {
|
||||
|
||||
run_make_test("
|
||||
all : def_1 def_2 def_3
|
||||
-def_1 : ; \@echo ONE; $sleep_command 3 ; echo TWO
|
||||
-def_2 : ; \@$sleep_command 2 ; echo THREE
|
||||
-def_3 : ; \@$sleep_command 1 ; echo FOUR",
|
||||
+def_1 : ; \@echo ONE; $sleep_command 12 ; echo TWO
|
||||
+def_2 : ; \@$sleep_command 8 ; echo THREE
|
||||
+def_3 : ; \@$sleep_command 4 ; echo FOUR",
|
||||
'-j4', "ONE\nFOUR\nTHREE\nTWO");
|
||||
|
||||
# Test parallelism with included files. Here we sleep/echo while
|
||||
@@ -38,8 +38,8 @@ def_3 : ; \@$sleep_command 1 ; echo FOUR
|
||||
run_make_test("
|
||||
all: 1 2; \@echo success
|
||||
-include 1.inc 2.inc
|
||||
-1.inc: ; \@echo ONE.inc; $sleep_command 2; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 2; echo TWO' > \$\@
|
||||
-2.inc: ; \@$sleep_command 1; echo THREE.inc; echo '2: ; \@$sleep_command 1; echo THREE' > \$\@",
|
||||
+1.inc: ; \@echo ONE.inc; $sleep_command 8; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 8; echo TWO' > \$\@
|
||||
+2.inc: ; \@$sleep_command 4; echo THREE.inc; echo '2: ; \@$sleep_command 4; echo THREE' > \$\@",
|
||||
"-j4",
|
||||
"ONE.inc\nTHREE.inc\nTWO.inc\nONE\nTHREE\nTWO\nsuccess\n");
|
||||
|
||||
@@ -57,8 +57,8 @@ ifeq (\$(INC),yes)
|
||||
-include 1.inc 2.inc
|
||||
endif
|
||||
|
||||
-1.inc: ; \@echo ONE.inc; $sleep_command 2; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 2; echo TWO' > \$\@
|
||||
-2.inc: ; \@$sleep_command 1; echo THREE.inc; echo '2: ; \@$sleep_command 1; echo THREE' > \$\@",
|
||||
+1.inc: ; \@echo ONE.inc; $sleep_command 8; echo TWO.inc; echo '1: ; \@echo ONE; $sleep_command 8; echo TWO' > \$\@
|
||||
+2.inc: ; \@$sleep_command 4; echo THREE.inc; echo '2: ; \@$sleep_command 4; echo THREE' > \$\@",
|
||||
"-j4",
|
||||
"ONE.inc\nTHREE.inc\nTWO.inc\nONE\nTHREE\nTWO\nsuccess\n");
|
||||
|
||||
@@ -74,37 +74,37 @@ rmfiles(qw(1.inc 2.inc));
|
||||
run_make_test("
|
||||
export HI = \$(shell \$(\$\@.CMD))
|
||||
first.CMD = echo hi
|
||||
-second.CMD = $sleep_command 4; echo hi
|
||||
+second.CMD = $sleep_command 16; echo hi
|
||||
|
||||
.PHONY: all first second
|
||||
all: first second
|
||||
|
||||
-first second: ; \@echo \$\@; $sleep_command 1; echo \$\@",
|
||||
- '-j2', "first\nfirst\nsecond\nsecond", 0, 7);
|
||||
+first second: ; \@echo \$\@; $sleep_command 4; echo \$\@",
|
||||
+ '-j2', "first\nfirst\nsecond\nsecond", 0, 28);
|
||||
|
||||
# Michael Matz <matz@suse.de> reported a bug where 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.
|
||||
|
||||
run_make_test("
|
||||
-.PHONY: all fail.1 fail.2 fail.3 ok
|
||||
-all: fail.1 ok fail.2 fail.3
|
||||
+.PHONY: all fail.3 fail.6 fail.9 ok
|
||||
+all: fail.3 ok fail.6 fail.9
|
||||
|
||||
-fail.1 fail.2 fail.3:
|
||||
+fail.3 fail.6 fail.9:
|
||||
\@sleep \$(patsubst fail.%,%,\$\@)
|
||||
\@echo Fail
|
||||
\@exit 1
|
||||
|
||||
ok:
|
||||
- \@sleep 4
|
||||
+ \@sleep 12
|
||||
\@echo Ok done",
|
||||
'-rR -j5', 'Fail
|
||||
-#MAKE#: *** [fail.1] Error 1
|
||||
+#MAKE#: *** [fail.3] Error 1
|
||||
#MAKE#: *** Waiting for unfinished jobs....
|
||||
Fail
|
||||
-#MAKE#: *** [fail.2] Error 1
|
||||
+#MAKE#: *** [fail.6] Error 1
|
||||
Fail
|
||||
-#MAKE#: *** [fail.3] Error 1
|
||||
+#MAKE#: *** [fail.9] Error 1
|
||||
Ok done',
|
||||
512);
|
||||
|
||||
Index: tests/scripts/options/dash-l
|
||||
===================================================================
|
||||
--- tests/scripts/options/dash-l.orig
|
||||
+++ tests/scripts/options/dash-l
|
||||
@@ -25,7 +25,7 @@ SHELL = /bin/sh
|
||||
|
||||
define test
|
||||
if [ ! -f test-file ]; then \
|
||||
- echo >> test-file; sleep 2; rm -f test-file; \
|
||||
+ echo >> test-file; sleep 8; rm -f test-file; \
|
||||
else \
|
||||
echo $@ FAILED; \
|
||||
fi
|
||||
@@ -46,7 +46,7 @@ $mkoptions = "-l 0.0001";
|
||||
$mkoptions .= " -j 4" if ($parallel_jobs);
|
||||
|
||||
# We have to wait longer than the default (5s).
|
||||
-&run_make_with_options($makefile, $mkoptions, &get_logfile, 0, 8);
|
||||
+&run_make_with_options($makefile, $mkoptions, &get_logfile, 0, 32);
|
||||
|
||||
$slurp = &read_file_into_string (&get_logfile(1));
|
||||
if ($slurp !~ /cannot enforce load limit/) {
|
||||
Index: tests/test_driver.pl
|
||||
===================================================================
|
||||
--- tests/test_driver.pl.orig
|
||||
+++ tests/test_driver.pl
|
||||
@@ -52,7 +52,7 @@ $test_passed = 1;
|
||||
|
||||
|
||||
# Timeout in seconds. If the test takes longer than this we'll fail it.
|
||||
-$test_timeout = 5;
|
||||
+$test_timeout = 20;
|
||||
|
||||
# Path to Perl
|
||||
$perl_name = $^X;
|
60
make.changes
60
make.changes
@ -1,3 +1,63 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 12:51:32 UTC 2013 - sweet_f_a@gmx.de
|
||||
|
||||
- Update to 4.0
|
||||
* see details in NEWS and ChangeLog files
|
||||
* Bugfixes, a complete list of bugs fixed in this version is
|
||||
available here
|
||||
http://sv.gnu.org/bugs/index.php?group=make&report_id=111&fix_release_id=101&set=custom
|
||||
* WARNING: Backward-incompatibility! backslash/newline handling
|
||||
* New feature: GNU Guile integration
|
||||
* New command line option: --output-sync (-O) enables grouping of
|
||||
output by target or by recursive make.
|
||||
* New command line option: --trace enables tracing of targets.
|
||||
* New command line option argument: --debug now accepts a "n"
|
||||
(none) flag which disables all debugging settings that are
|
||||
currently enabled.
|
||||
* New feature: The "job server" capability is now supported on
|
||||
Windows.
|
||||
* New feature: The .ONESHELL capability is now supported on
|
||||
Windows.
|
||||
* New feature: "!=" shell assignment operator as an alternative
|
||||
to the $(shell ...) function. Implemented for compatibility
|
||||
with BSD makefiles.
|
||||
* New feature: "::=" simple assignment operator as defined by
|
||||
POSIX in 2012.
|
||||
* New feature: Loadable objects
|
||||
* New function: $(file ...) writes to a file.
|
||||
* New variable: $(GNUMAKEFLAGS) will be parsed for make flags,
|
||||
just like MAKEFLAGS is. It can be set in the environment or
|
||||
the makefile, containing GNU make-specific flags to allow your
|
||||
makefile to be portable to other versions of make.
|
||||
* New variable: `MAKE_HOST' gives the name of the host
|
||||
architecture make was compiled for.
|
||||
* Behavior of MAKEFLAGS and MFLAGS is more rigorously defined.
|
||||
* Setting the -r and -R options in MAKEFLAGS inside a makefile
|
||||
now works as expected, removing all built-in rules and
|
||||
variables, respectively.
|
||||
* If a recipe fails, the makefile name and linenumber of the
|
||||
recipe are shown.
|
||||
* A .RECIPEPREFIX setting is remembered per-recipe and variables
|
||||
expanded in that recipe also use that recipe prefix setting.
|
||||
* In -p output, .RECIPEPREFIX settings are shown and all
|
||||
target-specific variables are output as if in a makefile,
|
||||
instead of as comments.
|
||||
* On MS-Windows, recipes that use ".." quoting will no longer force
|
||||
invocation of commands via temporary batch files.
|
||||
- Removed following patches, applied by upstream or fixed otherwise
|
||||
* make-disable-broken-tests.diff
|
||||
* make-savannah-bug30723-expand_makeflags_before_reexec.diff
|
||||
* make-savannah-bug30612-handling_of_archives.diff
|
||||
* make-fix_whitespace_tokenization.diff
|
||||
* make-glob-faster.patch
|
||||
* make-parallel-build.patch
|
||||
* bug-841457_make-savannah-bug30612-handling_of_archives-part2.txt
|
||||
* config-guess-update.diff
|
||||
- remove make-arglength.patch which was rejected by upstream. It
|
||||
was just a dirty hack to build a broken libwebkit version
|
||||
- remove make-slowdown-parallelism.diff, haven't seen any timing
|
||||
problems of the test-suite anymore
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 29 17:56:07 UTC 2013 - meissner@suse.com
|
||||
|
||||
|
27
make.spec
27
make.spec
@ -20,7 +20,7 @@ Name: make
|
||||
Url: http://www.gnu.org/software/make/make.html
|
||||
Provides: gmake
|
||||
PreReq: %install_info_prereq
|
||||
Version: 3.82
|
||||
Version: 4.0
|
||||
Release: 0
|
||||
Summary: GNU make
|
||||
License: GPL-2.0+
|
||||
@ -29,20 +29,7 @@ Source: http://ftp.gnu.org/gnu/make/make-%version.tar.bz2
|
||||
Source1: http://ftp.gnu.org/gnu/make/make-%version.tar.bz2.sig
|
||||
# keyring downloaded from http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=make
|
||||
Source2: %name.keyring
|
||||
Patch2: make-slowdown-parallelism.diff
|
||||
Patch3: make-disable-broken-tests.diff
|
||||
Patch4: make-savannah-bug30723-expand_makeflags_before_reexec.diff
|
||||
Patch5: make-savannah-bug30612-handling_of_archives.diff
|
||||
Patch6: make-fix_whitespace_tokenization.diff
|
||||
Patch7: make-glob-faster.patch
|
||||
# PATCH-FIX-UPSTREAM make-arglength.patch dimstar@opensuse.org -- http://article.gmane.org/gmane.comp.gnu.make.bugs/4219
|
||||
Patch8: make-arglength.patch
|
||||
# PATCH-FIX-UPSTREAM make-parallel-build.patch dmistar@opensuse.org -- http://savannah.gnu.org/bugs/?30653
|
||||
Patch9: make-parallel-build.patch
|
||||
# PATCH-FIX-UPSTREAM bug-841457_make-savannah-bug30612-handling_of_archives-part2.txt meissner@suse.com -- https://bugzilla.novell.com/show_bug.cgi?id=841457
|
||||
Patch10: bug-841457_make-savannah-bug30612-handling_of_archives-part2.txt
|
||||
Patch64: make-library-search-path.diff
|
||||
Patch65: config-guess-update.diff
|
||||
#BuildRequires: gpg-offline
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -51,19 +38,9 @@ The GNU make command with extensive documentation.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch2
|
||||
%patch3 -p1
|
||||
%patch4
|
||||
%patch5
|
||||
%patch6 -p1
|
||||
%patch7 -p0
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
if [ %_lib == lib64 ]; then
|
||||
%patch64
|
||||
fi
|
||||
%patch65
|
||||
|
||||
%build
|
||||
CFLAGS=$RPM_OPT_FLAGS \
|
||||
@ -77,6 +54,8 @@ make check
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
ln -s make $RPM_BUILD_ROOT/usr/bin/gmake
|
||||
%find_lang %name
|
||||
# gnumake.h was introduced in 4.0, looks useless
|
||||
rm $RPM_BUILD_ROOT/usr/include/gnumake.h
|
||||
|
||||
%files -f %name.lang
|
||||
%defattr(-,root,root)
|
||||
|
Loading…
Reference in New Issue
Block a user