rpm/make
SHA256
1
0
Fork 0
forked from pool/make
Code Pull Requests Activity

- make-savannah-bug30612-handling_of_archives.diff

Browse Source 
Fix Savannah bug #30612: handling of archive references with >1 object..
  Add oneshell to $(.FEATURES).
  Fix the NEWS file to be accurate.
- make-savannah-bug30723-expand_makeflags_before_reexec.diff
  Fix Savannah bug #30723: expand MAKEFLAGS before we re-exec after rebuilding
  makefiles.

OBS-URL: https://build.opensuse.org/package/show/Base:System/make?expand=0&rev=12
This commit is contained in:
Matthias Hopf 2010-09-07 17:37:08 +00:00 committed by Git OBS Bridge
parent 40205a44c3
commit 31c4fb0db2
4 changed files with 335 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

235
make-savannah-bug30612-handling_of_archives.diff Normal file
View File

@ -0,0 +1,235 @@
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;

85
make-savannah-bug30723-expand_makeflags_before_reexec.diff Normal file
View File

@ -0,0 +1,85 @@
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;

11
make.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Sep 7 17:22:32 UTC 2010 - mhopf@novell.com
- make-savannah-bug30612-handling_of_archives.diff
Fix Savannah bug #30612: handling of archive references with >1 object..
Add oneshell to $(.FEATURES).
Fix the NEWS file to be accurate.
- make-savannah-bug30723-expand_makeflags_before_reexec.diff
Fix Savannah bug #30723: expand MAKEFLAGS before we re-exec after rebuilding
makefiles.
-------------------------------------------------------------------
Mon Aug 30 17:37:23 UTC 2010 - mhopf@novell.com

4
make.spec
View File

@ -31,6 +31,8 @@ Summary: GNU make
Source: make-%version.tar.bz2
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
Patch64: make-library-search-path.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -41,6 +43,8 @@ The GNU make command with extensive documentation.
%setup
%patch2
%patch3 -p1
%patch4
%patch5
if [ %_lib == lib64 ]; then
%patch64
fi