Hello community,
here is the log from the commit of package make.1471 for openSUSE:12.2:Update checked in at 2013-03-26 17:15:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2:Update/make.1471 (Old)
and /work/SRC/openSUSE:12.2:Update/.make.1471.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "make.1471", Maintainer is ""
Changes:
--------
New Changes file:
--- /dev/null 2013-02-26 18:15:11.936010755 +0100
+++ /work/SRC/openSUSE:12.2:Update/.make.1471.new/make.changes 2013-03-26 17:15:50.000000000 +0100
@@ -0,0 +1,280 @@
+-------------------------------------------------------------------
+Wed Mar 20 22:22:57 UTC 2013 - jengelh@inai.de
+
+- Add make-parallel-build.patch from openSUSE:12.3/make
+ (bnc#810657)
+
+-------------------------------------------------------------------
+Tue Apr 10 14:26:35 CEST 2012 - meissner@suse.de
+
+- Faster globbing support from upstream to speed up
+ some large make projects like libreoffice. bnc#753323
+
+-------------------------------------------------------------------
+Tue Oct 11 22:37:40 CEST 2011 - mhrusecky@suse.cz
+
+- reverting previous change (qemu binfmt was fixed)
+
+-------------------------------------------------------------------
+Fri Sep 30 13:03:23 CEST 2011 - mhrusecky@suse.cz
+
+- using full ar path in tests on arm (fixes build)
+
+-------------------------------------------------------------------
+Tue Apr 19 15:22:27 UTC 2011 - mhopf@novell.com
+
+- make-fix_whitespace_tokenization.diff
+ Fix Savannah bug #33125 (bnc #681108):
+ Memory corruption during build of android build system.
+
+-------------------------------------------------------------------
+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
+
+- Disable some inherrently broken test cases.
+
+-------------------------------------------------------------------
+Mon Aug 23 13:39:12 UTC 2010 - mhopf@novell.com
+
+- Update to 3.82
+ - Bug fixes
+ - Backwards Incompatibilities:
+ - Makefiles with .POSIX target: shells called with -e
+ - $? contains prerequisites even if not existent
+ - Prerequisite with '=' cannot be backslash escaped any more
+ (use variable with '=' instead)
+ - Variable names may not contain whitespaces any more
+ - Mixture of explicit and pattern targets didn't always fail
+ - Pattern specific rules application order changed
+ - Library search behavior now compatible with standard linker
+ - New features
+ - --eval=STRING: Evaluate makefile syntax string before makefile
+ - Variable .RECIPEPREFIX: Exchange TAB character
+ - Variable .SHELLFLAGS: Options passed to shells
+ - Target .ONESHELL: Single instance of shell for recipe
+ - Modifier private: Suppresses inheritance of variables
+ - Directive undefine: Undefine variable
+ - Changed features
+ - Multiple modifiers for variables allowed now.
+ - Directive define: Allow variable assignment operator.
+- Nuke memory-hog-2.diff which didn't apply since 3.81
+- Addapt make-slowdown-parallelism.diff to new parallelization tests
+- Separate make checks into %checks section
+
+-------------------------------------------------------------------
+Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de
+
+- use %_smp_mflags
+
+-------------------------------------------------------------------
+Mon May 24 17:16:41 UTC 2010 - coolo@novell.com
+
+- fix test case
+
+-------------------------------------------------------------------
+Fri Jan 8 17:33:04 CET 2010 - ro@suse.de
+
+- enable parallel build
+
+-------------------------------------------------------------------
+Mon May 14 17:46:30 CEST 2007 - coolo@suse.de
+
+- use %find_lang
+
+-------------------------------------------------------------------
+Tue Oct 31 12:48:35 CET 2006 - mhopf@suse.de
+
+- Reducing race probability in test case features/parallelism even more.
+
+-------------------------------------------------------------------
+Wed Jun 7 12:20:28 CEST 2006 - mhopf@suse.de
+
+- Improving occasional build failures due to races in test cases.
+
+-------------------------------------------------------------------
+Mon May 29 14:28:37 CEST 2006 - mhopf@suse.de
+
+- Update to 3.81
+ - Bug fixes
+ - New functions: lastword, abspath, realpath, info, flavor, or, and
+ - New variables: .INCLUDE_DIRS, .FEATURES, .DEFAULT_GOAL, MAKE_RESTARTS, $|
+ - Some new features
+ - More POSIX compatibility
+- memory-hog-2.diff doesn't apply any longer
+
+-------------------------------------------------------------------
+Wed Feb 1 20:29:39 CET 2006 - kssingvo@suse.de
+
+- fix for memory-hog.diff (bugzilla#147229)
+
+-------------------------------------------------------------------
+Wed Feb 1 18:15:14 CET 2006 - kssingvo@suse.de
+
+- disabled memory-hog.diff due to crashes (bugzilla#147229)
+
+-------------------------------------------------------------------
+Wed Jan 25 21:30:30 CET 2006 - mls@suse.de
+
+- converted neededforbuild to BuildRequires
+
+-------------------------------------------------------------------
+Thu Jan 19 14:36:00 CET 2006 - aj@suse.de
+
+- Reduce memory usage.
+
+-------------------------------------------------------------------
+Fri Jan 9 16:16:49 CET 2004 - adrian@suse.de
+
+- do not strip binaries during install
+
+-------------------------------------------------------------------
+Tue Sep 30 18:56:18 CEST 2003 - stepan@suse.de
+
+- fix "virtual memory exhausted" bug (backport from mainline)
+
+-------------------------------------------------------------------
+Thu Apr 24 12:20:23 CEST 2003 - ro@suse.de
+
+- fix install_info --delete call and move from preun to postun
+
+-------------------------------------------------------------------
+Wed Apr 16 16:20:30 CEST 2003 - coolo@suse.de
+
+- use BuildRoot
+
+-------------------------------------------------------------------
+Fri Feb 7 02:03:03 CET 2003 - ro@suse.de
+
+- added install_info macros
+
+-------------------------------------------------------------------
+Mon Dec 30 16:57:22 CET 2002 - aj@suse.de
+
+- Update to version 3.80:
+ - number of bug fixes
+ - new features as mentioned in the NEWS file:
+ * New functions $(value ...), $(eval ...)
+ * New feature: order-only prerequesites.
+ * Argument to ifdef can now be a variable.
+ * new option --always-make
+
+-------------------------------------------------------------------
+Tue Sep 17 18:43:14 CEST 2002 - ro@suse.de
+
+- removed bogus self-provides
+
+-------------------------------------------------------------------
+Thu May 23 15:39:17 CEST 2002 - meissner@suse.de
+
+- Made %_lib fix generic, do not use ifarch.
+
+-------------------------------------------------------------------
+Mon Apr 22 14:43:25 CEST 2002 - meissner@suse.de
+
+- x86_64 needs /*/lib64 as search path too.
+
+-------------------------------------------------------------------
+Fri Apr 19 14:55:23 CEST 2002 - ke@suse.de
+
+- Update German translation from
+ http://www.iro.umontreal.ca/contrib/po/teams/PO/de/ [# 15851].
+
+-------------------------------------------------------------------
+Tue Dec 11 17:19:45 CET 2001 - froh@suse.de
+
+- s390x, sparc64 and ia64: extended the 'Dynamic Library Search'
+ default path to search /lib64 and /usr/lib64 as well.
+
++++ 83 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:12.2:Update/.make.1471.new/make.changes
New:
----
make-3.82.tar.bz2
make-disable-broken-tests.diff
make-fix_whitespace_tokenization.diff
make-glob-faster.patch
make-library-search-path.diff
make-parallel-build.patch
make-savannah-bug30612-handling_of_archives.diff
make-savannah-bug30723-expand_makeflags_before_reexec.diff
make-slowdown-parallelism.diff
make.changes
make.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ make.spec ++++++
#
# spec file for package make
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: make
Url: http://www.gnu.org/software/make/make.html
Provides: gmake
PreReq: %install_info_prereq
Version: 3.82
Release: 0
Summary: GNU make
License: GPL-2.0+
Group: Development/Tools/Building
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
Patch6: make-fix_whitespace_tokenization.diff
Patch7: make-glob-faster.patch
Patch8: make-parallel-build.patch
Patch64: make-library-search-path.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
The GNU make command with extensive documentation.
%prep
%setup -q
%patch2
%patch3 -p1
%patch4
%patch5
%patch6 -p1
%patch7 -p0
%patch -P 8 -p1
if [ %_lib == lib64 ]; then
%patch64
fi
%build
CFLAGS=$RPM_OPT_FLAGS \
./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
make %{?_smp_mflags}
%check
make check
%install
make DESTDIR=$RPM_BUILD_ROOT install
ln -s make $RPM_BUILD_ROOT/usr/bin/gmake
%find_lang %name
%files -f %name.lang
%defattr(-,root,root)
/usr/bin/make
/usr/bin/gmake
%doc /usr/share/info/make.info-*.gz
%doc /usr/share/info/make.info.gz
%doc /usr/share/man/man1/make.1.gz
%clean
rm -rf $RPM_BUILD_ROOT
%post
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%postun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%changelog
++++++ make-disable-broken-tests.diff ++++++
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;
++++++ make-fix_whitespace_tokenization.diff ++++++
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 *));
++++++ make-glob-faster.patch ++++++
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;
++++++ make-library-search-path.diff ++++++
make searches for -lmoo targets in /lib and /usr/lib after mangling
them with .LIBPATTERNS into libmoo.so
This patch extends to teh search path to /lib64/ and /usr/lib64
--- remake.c 2001/12/11 15:59:03 1.1
+++ remake.c 2001/12/11 16:01:01
@@ -1252,6 +1252,8 @@
static char *dirs[] =
{
#ifndef _AMIGA
+ "/lib64",
+ "/usr/lib64",
"/lib",
"/usr/lib",
#endif
++++++ make-parallel-build.patch ++++++
References: http://savannah.gnu.org/bugs/?30653
Upstream: yes; backported to openSUSE (dimstar@opensuse.org)
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);
++++++ make-savannah-bug30612-handling_of_archives.diff ++++++
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
participants (1)
-
root＠hilbert.suse.de