diff --git a/bug-841457_make-savannah-bug30612-handling_of_archives-part2.txt b/bug-841457_make-savannah-bug30612-handling_of_archives-part2.txt new file mode 100644 index 0000000..465a74c --- /dev/null +++ b/bug-841457_make-savannah-bug30612-handling_of_archives-part2.txt @@ -0,0 +1,45 @@ +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 + diff --git a/make.changes b/make.changes index 5bf20f6..75060c8 100644 --- a/make.changes +++ b/make.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Sep 29 17:56:07 UTC 2013 - meissner@suse.com + +- fixed a make target issue with .a (x y) targets (bnc#841457) + ------------------------------------------------------------------- Tue Jun 18 08:45:36 UTC 2013 - coolo@suse.com diff --git a/make.spec b/make.spec index da28dda..da10b95 100644 --- a/make.spec +++ b/make.spec @@ -39,6 +39,8 @@ Patch7: make-glob-faster.patch 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 @@ -57,6 +59,7 @@ The GNU make command with extensive documentation. %patch7 -p0 %patch8 -p1 %patch9 -p1 +%patch10 -p1 if [ %_lib == lib64 ]; then %patch64 fi