From b2a7a76b7745853ab50a3d818c15e37a1871964a3bc598310f50906017497b11 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 13 Jun 2016 07:04:12 +0000 Subject: [PATCH] Accepting request 401382 from home:pluskalm:branches:Base:System - Update to version 4.2.1: * bug-fix release - Drop upstream patches: * 0001-SV-47995-Ensure-forced-double-colon-rules-work-with-.patch * 0002-main.c-main-SV-48009-Reset-stack-limit-for-make-re-e.patch - Small spec file cleanup * man and info pages are implicitly marked as documentation OBS-URL: https://build.opensuse.org/request/show/401382 OBS-URL: https://build.opensuse.org/package/show/Base:System/make?expand=0&rev=51 --- ...forced-double-colon-rules-work-with-.patch | 171 ------------------ ...8009-Reset-stack-limit-for-make-re-e.patch | 30 --- make-4.2.1.tar.bz2 | 3 + make-4.2.1.tar.bz2.sig | Bin 0 -> 72 bytes make-4.2.tar.bz2 | 3 - make-4.2.tar.bz2.sig | Bin 72 -> 0 bytes make.changes | 11 ++ make.spec | 20 +- 8 files changed, 22 insertions(+), 216 deletions(-) delete mode 100644 0001-SV-47995-Ensure-forced-double-colon-rules-work-with-.patch delete mode 100644 0002-main.c-main-SV-48009-Reset-stack-limit-for-make-re-e.patch create mode 100644 make-4.2.1.tar.bz2 create mode 100644 make-4.2.1.tar.bz2.sig delete mode 100644 make-4.2.tar.bz2 delete mode 100644 make-4.2.tar.bz2.sig diff --git a/0001-SV-47995-Ensure-forced-double-colon-rules-work-with-.patch b/0001-SV-47995-Ensure-forced-double-colon-rules-work-with-.patch deleted file mode 100644 index 9a04b51..0000000 --- a/0001-SV-47995-Ensure-forced-double-colon-rules-work-with-.patch +++ /dev/null @@ -1,171 +0,0 @@ -From 4762480ae9cb8df4878286411f178d32db14eff0 Mon Sep 17 00:00:00 2001 -From: Paul Smith -Date: Tue, 31 May 2016 02:56:51 -0400 -Subject: [PATCH 1/2] [SV 47995] Ensure forced double-colon rules work with -j. - -The fix for SV 44742 had a side-effect that some double-colon targets -were skipped. This happens because the "considered" facility assumed -that all targets would be visited on each walk through the dependency -graph: we used a bit for considered and toggled it on each pass; if -we didn't walk the entire graph on every pass the bit would get out -of sync. The new behavior after SV 44742 might return early without -walking the entire graph. To fix this I changed the considered value -to an integer which is monotonically increasing: it is then never -possible to incorrectly determine that a previous pass through the -graph already considered the current target. - -* filedef.h (struct file): make CONSIDERED an unsigned int. -* main.c (main): No longer need to reset CONSIDERED. -* remake.c (update_goal_chain): increment CONSIDERED rather than -inverting it between 0<->1. -(update_file_1): Reset CONSIDERED to 0 so it's re-considered. -(check_dep): Ditto. -* tests/scripts/features/double_colon: Add a regression test. ---- - filedef.h | 4 ++-- - main.c | 4 ---- - remake.c | 25 +++++++++++++------------ - tests/scripts/features/double_colon | 15 +++++++++++++++ - 4 files changed, 30 insertions(+), 18 deletions(-) - -diff --git a/filedef.h b/filedef.h -index 507a027..14b4187 100644 ---- a/filedef.h -+++ b/filedef.h -@@ -58,6 +58,8 @@ struct file - FILE_TIMESTAMP last_mtime; /* File's modtime, if already known. */ - FILE_TIMESTAMP mtime_before_update; /* File's modtime before any updating - has been performed. */ -+ unsigned int considered; /* equal to 'considered' if file has been -+ considered on current scan of goal chain */ - int command_flags; /* Flags OR'd in for cmds; see commands.h. */ - enum update_status /* Status of the last attempt to update. */ - { -@@ -96,8 +98,6 @@ struct file - unsigned int ignore_vpath:1;/* Nonzero if we threw out VPATH name. */ - unsigned int pat_searched:1;/* Nonzero if we already searched for - pattern-specific variables. */ -- unsigned int considered:1; /* equal to 'considered' if file has been -- considered on current scan of goal chain */ - unsigned int no_diag:1; /* True if the file failed to update and no - diagnostics has been issued (dontcare). */ - }; -diff --git a/main.c b/main.c -index 576f2e9..e606488 100644 ---- a/main.c -+++ b/main.c -@@ -2262,10 +2262,6 @@ main (int argc, char **argv, char **envp) - - for (i = 0, d = read_files; d != 0; ++i, d = d->next) - { -- /* Reset the considered flag; we may need to look at the file -- again to print an error. */ -- d->file->considered = 0; -- - if (d->file->updated) - { - /* This makefile was updated. */ -diff --git a/remake.c b/remake.c -index df1a9e0..5d5d67a 100644 ---- a/remake.c -+++ b/remake.c -@@ -57,8 +57,9 @@ unsigned int commands_started = 0; - static struct goaldep *goal_list; - static struct dep *goal_dep; - --/* Current value for pruning the scan of the goal chain (toggle 0/1). */ --static unsigned int considered; -+/* Current value for pruning the scan of the goal chain. -+ All files start with considered == 0. */ -+static unsigned int considered = 0; - - static enum update_status update_file (struct file *file, unsigned int depth); - static enum update_status update_file_1 (struct file *file, unsigned int depth); -@@ -90,12 +91,12 @@ update_goal_chain (struct goaldep *goaldeps) - - goal_list = rebuilding_makefiles ? goaldeps : NULL; - -- /* All files start with the considered bit 0, so the global value is 1. */ -- considered = 1; -- - #define MTIME(file) (rebuilding_makefiles ? file_mtime_no_search (file) \ - : file_mtime (file)) - -+ /* Start a fresh batch of consideration. */ -+ ++considered; -+ - /* Update all the goals until they are all finished. */ - - while (goals != 0) -@@ -247,10 +248,10 @@ update_goal_chain (struct goaldep *goaldeps) - } - } - -- /* If we reached the end of the dependency graph toggle the considered -- flag for the next pass. */ -+ /* If we reached the end of the dependency graph update CONSIDERED -+ for the next pass. */ - if (g == 0) -- considered = !considered; -+ ++considered; - } - - if (rebuilding_makefiles) -@@ -615,8 +616,8 @@ update_file_1 (struct file *file, unsigned int depth) - break; - - if (!running) -- /* The prereq is considered changed if the timestamp has changed while -- it was built, OR it doesn't exist. */ -+ /* The prereq is considered changed if the timestamp has changed -+ while it was built, OR it doesn't exist. */ - d->changed = ((file_mtime (d->file) != mtime) - || (mtime == NONEXISTENT_MTIME)); - -@@ -650,7 +651,7 @@ update_file_1 (struct file *file, unsigned int depth) - /* We may have already considered this file, when we didn't know - we'd need to update it. Force update_file() to consider it and - not prune it. */ -- d->file->considered = !considered; -+ d->file->considered = 0; - - new = update_file (d->file, depth); - if (new > dep_status) -@@ -1087,7 +1088,7 @@ check_dep (struct file *file, unsigned int depth, - /* If the target was waiting for a dependency it has to be - reconsidered, as that dependency might have finished. */ - if (file->command_state == cs_deps_running) -- file->considered = !considered; -+ file->considered = 0; - - set_command_state (file, cs_not_started); - } -diff --git a/tests/scripts/features/double_colon b/tests/scripts/features/double_colon -index 80ddb31..58f126f 100644 ---- a/tests/scripts/features/double_colon -+++ b/tests/scripts/features/double_colon -@@ -197,6 +197,21 @@ all:: 3 - ', - '-rs -j2 1 2 root', "all_one\nall_two\nroot\n"); - -+# SV 47995 : Parallel double-colon rules with FORCE -+ -+run_make_test(' -+all:: ; @echo one -+ -+all:: joe ; @echo four -+ -+joe: FORCE ; touch joe-is-forced -+ -+FORCE: -+', -+ '-j5', "one\ntouch joe-is-forced\nfour\n"); -+ -+unlink('joe-is-forced'); -+ - # This tells the test driver that the perl test script executed properly. - 1; - --- -2.8.3 - diff --git a/0002-main.c-main-SV-48009-Reset-stack-limit-for-make-re-e.patch b/0002-main.c-main-SV-48009-Reset-stack-limit-for-make-re-e.patch deleted file mode 100644 index b3d8554..0000000 --- a/0002-main.c-main-SV-48009-Reset-stack-limit-for-make-re-e.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a3d8c086d54c112fecfa2b9026a32a14f741f5f5 Mon Sep 17 00:00:00 2001 -From: Jeremy Devenport -Date: Tue, 31 May 2016 03:09:24 -0400 -Subject: [PATCH 2/2] * main.c (main): [SV 48009] Reset stack limit for make - re-exec. - -Copyright-paperwork-exempt: yes ---- - main.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/main.c b/main.c -index e606488..fa8045f 100644 ---- a/main.c -+++ b/main.c -@@ -2454,6 +2454,11 @@ main (int argc, char **argv, char **envp) - exit (WIFEXITED(r) ? WEXITSTATUS(r) : EXIT_FAILURE); - } - #else -+#ifdef SET_STACK_SIZE -+ /* Reset limits, if necessary. */ -+ if (stack_limit.rlim_cur) -+ setrlimit (RLIMIT_STACK, &stack_limit); -+#endif - exec_command ((char **)nargv, environ); - #endif - free (aargv); --- -2.8.3 - diff --git a/make-4.2.1.tar.bz2 b/make-4.2.1.tar.bz2 new file mode 100644 index 0000000..7032ff1 --- /dev/null +++ b/make-4.2.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589 +size 1407126 diff --git a/make-4.2.1.tar.bz2.sig b/make-4.2.1.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..fb6065ba979f410450418078a794c88cabaa64799f8b2eec7497a3378b5bde2a GIT binary patch literal 72 zcmV-O0Jr~$Mg#y60ssaD0#{p2?*Ix35SFk<6=OKI)PmgrpLwM-rxnI0b6RWPjJXKs e{S=lXDgdCPp9bO#q%L`U-SabJIrWI^Q58Z=y1KIJ&5qyBz@l diff --git a/make.changes b/make.changes index baa6089..0740b7c 100644 --- a/make.changes +++ b/make.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun Jun 12 09:13:27 UTC 2016 - mpluskal@suse.com + +- Update to version 4.2.1: + * bug-fix release +- Drop upstream patches: + * 0001-SV-47995-Ensure-forced-double-colon-rules-work-with-.patch + * 0002-main.c-main-SV-48009-Reset-stack-limit-for-make-re-e.patch +- Small spec file cleanup + * man and info pages are implicitly marked as documentation + ------------------------------------------------------------------- Mon May 23 08:13:35 UTC 2016 - schwab@suse.de diff --git a/make.spec b/make.spec index e636ed2..1f63cad 100644 --- a/make.spec +++ b/make.spec @@ -17,7 +17,7 @@ Name: make -Version: 4.2 +Version: 4.2.1 Release: 0 Summary: GNU make License: GPL-2.0+ @@ -29,8 +29,6 @@ Source1: http://ftp.gnu.org/gnu/make/make-%{version}.tar.bz2.sig Source2: %{name}.keyring Patch1: make-testcases_timeout.diff Patch64: make-library-search-path.diff -Patch2: 0001-SV-47995-Ensure-forced-double-colon-rules-work-with-.patch -Patch3: 0002-main.c-main-SV-48009-Reset-stack-limit-for-make-re-e.patch Requires(post): %{install_info_prereq} Requires(preun): %{install_info_prereq} Recommends: %{name}-lang @@ -48,8 +46,6 @@ The GNU make command with extensive documentation. if [ %{_lib} == lib64 ]; then %patch64 -p1 fi -%patch2 -p1 -%patch3 -p1 # This test always fails rm -f tests/scripts/features/output-sync @@ -59,10 +55,10 @@ export CFLAGS="%{optflags}" make %{?_smp_mflags} %check -make check +make %{?_smp_mflags} check %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +make %{?_smp_mflags} DESTDIR=%{buildroot} install ln -s make %{buildroot}%{_bindir}/gmake %find_lang %{name} # gnumake.h was introduced in 4.0, looks useless @@ -72,17 +68,17 @@ rm %{buildroot}%{_includedir}/gnumake.h %defattr(-,root,root) %{_bindir}/make %{_bindir}/gmake -%doc %{_infodir}/make.info-*.gz -%doc %{_infodir}/make.info.gz -%doc %{_mandir}/man1/make.1.gz +%{_infodir}/make.info-*%{ext_info} +%{_infodir}/make.info%{ext_info} +%{_mandir}/man1/make.1%{ext_man} %files lang -f %{name}.lang %defattr(-,root,root) %post -%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz +%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info} %preun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz +%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info} %changelog