From 80d93f4b55e8ac60cb9074aa167e07750322f34db88f68f4179ff06674b5ecb3 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 16 Oct 2014 05:59:51 +0000 Subject: [PATCH] Accepting request 256791 from home:AndreasStieger:branches:Base:System make 4.1 OBS-URL: https://build.opensuse.org/request/show/256791 OBS-URL: https://build.opensuse.org/package/show/Base:System/make?expand=0&rev=43 --- make-4.0.tar.bz2 | 3 --- make-4.0.tar.bz2.sig | Bin 72 -> 0 bytes make-4.1.tar.bz2 | 3 +++ make-4.1.tar.bz2.sig | Bin 0 -> 72 bytes make-library-search-path.diff | 14 +++++++--- make-testcases_timeout.diff | 49 +++++++--------------------------- make.changes | 14 ++++++++++ make.spec | 6 ++--- 8 files changed, 40 insertions(+), 49 deletions(-) delete mode 100644 make-4.0.tar.bz2 delete mode 100644 make-4.0.tar.bz2.sig create mode 100644 make-4.1.tar.bz2 create mode 100644 make-4.1.tar.bz2.sig diff --git a/make-4.0.tar.bz2 b/make-4.0.tar.bz2 deleted file mode 100644 index d0c3a4a..0000000 --- a/make-4.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e60686c7afede62cc8c86ad3012cf081ea4887daf9d223ce7115703b2bb2dbdb -size 1341927 diff --git a/make-4.0.tar.bz2.sig b/make-4.0.tar.bz2.sig deleted file mode 100644 index a90a40462dff04be58fc4aac1560ad7a5c1d5318202453df12e19136ca28d7c5..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72 zcmV-O0Jr~$Mg#y60ssaD0#a1;oB#?55SFk<6=OKI)SEc~o+jw?hGUZ%>;%u@X%Q3F eT25!B3;>@*LEFlXOK-PHK9SS-RU&mIZGSX-d>gs| diff --git a/make-4.1.tar.bz2 b/make-4.1.tar.bz2 new file mode 100644 index 0000000..5313e31 --- /dev/null +++ b/make-4.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0bc7613389650ee6a24554b52572a272f7356164fd2c4132b0bcf13123e4fca5 +size 1327342 diff --git a/make-4.1.tar.bz2.sig b/make-4.1.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..ae8f10d7554a5b1d9aa35cc5602d580cd2f0fb256fe3cce0cee423d8da8dd718 GIT binary patch literal 72 zcmV-O0Jr~$Mg#y60ssaD0#q?^qW}sC5SFk<6=OKI)Q<`Ppv7)3@?O5Ol8!xTALw<^ ebSh|?jR2bj=%v7Nb;$EZ%&!TQ81xllxs-Wy6&*wX literal 0 HcmV?d00001 diff --git a/make-library-search-path.diff b/make-library-search-path.diff index 3efca84..b915d42 100644 --- a/make-library-search-path.diff +++ b/make-library-search-path.diff @@ -3,10 +3,16 @@ 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[] = +--- + remake.c | 2 ++ + 1 file changed, 2 insertions(+) + +Index: make-4.1/remake.c +=================================================================== +--- make-4.1.orig/remake.c 2014-10-05 17:24:51.000000000 +0100 ++++ make-4.1/remake.c 2014-10-15 23:20:42.000000000 +0100 +@@ -1549,6 +1549,8 @@ library_search (const char *lib, FILE_TI + static const char *dirs[] = { #ifndef _AMIGA + "/lib64", diff --git a/make-testcases_timeout.diff b/make-testcases_timeout.diff index 009938a..6861add 100644 --- a/make-testcases_timeout.diff +++ b/make-testcases_timeout.diff @@ -1,46 +1,17 @@ -diff -rNU 20 ../make-4.0-o/tests/test_driver.pl ./tests/test_driver.pl ---- ../make-4.0-o/tests/test_driver.pl 2013-10-09 08:05:39.000000000 +0200 -+++ ./tests/test_driver.pl 2014-03-11 14:08:15.000000000 +0100 -@@ -33,41 +33,41 @@ - - # The number of test categories we've run - $categories_run = 0; - # The number of test categroies that have passed - $categories_passed = 0; - # The total number of individual tests that have been run - $total_tests_run = 0; - # The total number of individual tests that have passed - $total_tests_passed = 0; - # The number of tests in this category that have been run - $tests_run = 0; - # The number of tests in this category that have passed - $tests_passed = 0; - - - # Yeesh. This whole test environment is such a hack! +--- + tests/test_driver.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: make-4.1/tests/test_driver.pl +=================================================================== +--- make-4.1.orig/tests/test_driver.pl 2014-10-15 23:16:56.000000000 +0100 ++++ make-4.1/tests/test_driver.pl 2014-10-15 23:17:23.000000000 +0100 +@@ -49,7 +49,7 @@ $tests_passed = 0; $test_passed = 1; - # Timeout in seconds. If the test takes longer than this we'll fail it. -$test_timeout = 5; +$test_timeout = 8; + $test_timeout = 10 if $^O eq 'VMS'; # Path to Perl - $perl_name = $^X; - - # %makeENV is the cleaned-out environment. - %makeENV = (); - - # %extraENV are any extra environment variables the tests might want to set. - # These are RESET AFTER EVERY TEST! - %extraENV = (); - - # %origENV is the caller's original environment - %origENV = %ENV; - - sub resetENV - { - # We used to say "%ENV = ();" but this doesn't work in Perl 5.000 - # through Perl 5.004. It was fixed in Perl 5.004_01, but we don't - # want to require that here, so just delete each one individually. - foreach $v (keys %ENV) { diff --git a/make.changes b/make.changes index 17eec73..6b9ddd2 100644 --- a/make.changes +++ b/make.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Oct 15 22:21:06 UTC 2014 - andreas.stieger@gmx.de + +- make 4.1: + * New variables: $(MAKE_TERMOUT) and $(MAKE_TERMERR) are set to + non-empty values if stdout or stderr, respectively, are + believed to be writing to a terminal. These variables are + exported by default. + * Allow a no-text-argument form of the $(file ...) function. + * Change the fatal error for mixed explicit and implicit rules +- refresh for contect changes: + * make-library-search-path.diff + * make-testcases_timeout.diff + ------------------------------------------------------------------- Tue Mar 11 14:10:15 CET 2014 - draht@suse.de diff --git a/make.spec b/make.spec index c44b7b2..9073c38 100644 --- a/make.spec +++ b/make.spec @@ -20,7 +20,7 @@ Name: make Url: http://www.gnu.org/software/make/make.html Provides: gmake PreReq: %install_info_prereq -Version: 4.0 +Version: 4.1 Release: 0 Summary: GNU make License: GPL-2.0+ @@ -39,9 +39,9 @@ The GNU make command with extensive documentation. %prep %setup -q -%patch1 -p0 +%patch1 -p1 if [ %_lib == lib64 ]; then -%patch64 +%patch64 -p1 fi %build