Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=16dfbdf6eda0afdb7e0349bdbddc87423ccd0189
commit 16dfbdf6eda0afdb7e0349bdbddc87423ccd0189 Author: crazy <[email protected]> Date: Tue May 24 04:54:56 2016 +0200 make-4.2-1-x86_64 * Version bump * reverted one commit , see : * http://lists.gnu.org/archive/html/bug-make/2016-05/msg00041.html diff --git a/source/devel/make/FrugalBuild b/source/devel/make/FrugalBuild index 3c9cc8f..1f5e42a 100644 --- a/source/devel/make/FrugalBuild +++ b/source/devel/make/FrugalBuild @@ -2,15 +2,17 @@ # Maintainer: Miklos Vajna <[email protected]> pkgname=make -pkgver=4.1 -pkgrel=2 +pkgver=4.2 +pkgrel=1 pkgdesc="GNU make utility to maintain groups of programs" url="http://www.gnu.org/software/make"; depends=('glibc>=2.8-3' 'bash') groups=('devel' 'devel-core') -archs=('i686' 'x86_64' 'arm') +archs=('i686' 'x86_64') Fup2gnugz -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('6379dc729d757971e31c8267bd5e51f6d598090e') +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz \ + revert-9bb994e8319c2b153cd3d6d61e2c2882895e7c3a.patch) +sha1sums=('0ae8f44ad73e66d8f7b91e7e2e39ed8a8f2c7428' \ + '4db65236a8e58d9b9b3a81747fc1ea4769c8644d') Fconfopts+=" --disable-silent-rules" # optimization OK diff --git a/source/devel/make/revert-9bb994e8319c2b153cd3d6d61e2c2882895e7c3a.patch b/source/devel/make/revert-9bb994e8319c2b153cd3d6d61e2c2882895e7c3a.patch new file mode 100644 index 0000000..223c7bf --- /dev/null +++ b/source/devel/make/revert-9bb994e8319c2b153cd3d6d61e2c2882895e7c3a.patch @@ -0,0 +1,125 @@ +commit : http://git.savannah.gnu.org/cgit/make.git/patch/?id=9bb994e8319c2b153cd3d6d61e2c2882895e7c3a +ML-link: http://lists.gnu.org/archive/html/bug-make/2016-05/msg00041.html + +diff -Naur make-4.2/remake.c make-4.2-revert/remake.c +--- make-4.2/remake.c 2016-05-21 23:34:45.000000000 +0200 ++++ make-4.2-revert/remake.c 2016-05-24 04:29:47.263731522 +0200 +@@ -320,7 +320,7 @@ + && !f->dontcare && f->no_diag)) + { + DBF (DB_VERBOSE, _("Pruning file '%s'.\n")); +- return f->command_state == cs_finished ? f->update_status : us_success; ++ return f->command_state == cs_finished ? f->update_status : 0; + } + } + +@@ -344,9 +344,12 @@ + + if (f->command_state == cs_running + || f->command_state == cs_deps_running) +- /* Don't run other :: rules for this target until +- this rule is finished. */ +- return us_success; ++ { ++ /* Don't run the other :: rules for this ++ file until this rule is finished. */ ++ status = us_success; ++ break; ++ } + + if (new > status) + status = new; +@@ -1271,7 +1274,6 @@ + f_mtime (struct file *file, int search) + { + FILE_TIMESTAMP mtime; +- int propagate_timestamp; + + /* File's mtime is not known; must get it from the system. */ + +@@ -1448,13 +1450,10 @@ + } + } + +- /* Store the mtime into all the entries for this file for which it is safe +- to do so: avoid propagating timestamps to double-colon rules that haven't +- been examined so they're run or not based on the pre-update timestamp. */ ++ /* Store the mtime into all the entries for this file. */ + if (file->double_colon) + file = file->double_colon; + +- propagate_timestamp = file->updated; + do + { + /* If this file is not implicit but it is intermediate then it was +@@ -1466,8 +1465,7 @@ + && !file->tried_implicit && file->intermediate) + file->intermediate = 0; + +- if (file->updated == propagate_timestamp) +- file->last_mtime = mtime; ++ file->last_mtime = mtime; + file = file->prev; + } + while (file != 0); +diff -Naur make-4.2/tests/scripts/features/double_colon make-4.2-revert/tests/scripts/features/double_colon +--- make-4.2/tests/scripts/features/double_colon 2016-05-21 23:34:45.000000000 +0200 ++++ make-4.2-revert/tests/scripts/features/double_colon 2016-05-24 04:29:47.264731548 +0200 +@@ -151,7 +151,8 @@ + + unlink('result','one','two'); + +-# TEST 10: SV 33399 : check for proper backslash handling ++# TEST 10: check for proper backslash handling ++# Savannah bug #33399 + + run_make_test(' + a\ xb :: ; @echo one +@@ -159,47 +160,5 @@ + ', + '', "one\ntwo\n"); + +-# Test 11: SV 44742 : All double-colon rules should be run in parallel build. +- +-run_make_test('result :: 01 +- @echo update +- @touch $@ +-result :: 02 +- @echo update +- @touch $@ +-result :: 03 +- @echo update +- @touch $@ +-result :: 04 +- @echo update +- @touch $@ +-result :: 05 +- @echo update +- @touch $@ +-01 02 03 04 05: +- @touch 01 02 03 04 05 +-', +- '-j10 result', "update\nupdate\nupdate\nupdate\nupdate\n"); +- +-unlink('result', '01', '02', '03', '04', '05'); +- +-# Test 12: SV 44742 : Double-colon rules with parallelism +- +-run_make_test(' +-root: all +- echo root +-all:: +- echo all_one +-all:: 3 +- echo all_two +-%: +- sleep $* +-', +- '-rs -j2 1 2 root', "all_one\nall_two\nroot\n"); +- + # This tells the test driver that the perl test script executed properly. + 1; +- +-### Local Variables: +-### eval: (setq whitespace-action (delq 'auto-cleanup whitespace-action)) +-### End: _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
