From bf28d156c49ef8c43a489b61faeed4d354b9d4376539f5b688847258479ec55a Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 25 May 2010 11:23:42 +0000 Subject: [PATCH] Accepting request 40597 from Base:System Copy from Base:System/make based on submit request 40597 from user coolo OBS-URL: https://build.opensuse.org/request/show/40597 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/make?expand=0&rev=8 --- make-fix-testcase.patch | 13 +++++++++++++ make.changes | 5 +++++ make.spec | 12 +++--------- 3 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 make-fix-testcase.patch diff --git a/make-fix-testcase.patch b/make-fix-testcase.patch new file mode 100644 index 0000000..8b5d7a5 --- /dev/null +++ b/make-fix-testcase.patch @@ -0,0 +1,13 @@ +Index: make-3.81/tests/scripts/features/recursion +=================================================================== +--- make-3.81.orig/tests/scripts/features/recursion 2005-02-10 01:10:58.000000000 +0100 ++++ make-3.81/tests/scripts/features/recursion 2010-05-24 19:08:50.647462945 +0200 +@@ -16,7 +16,7 @@ last: + @echo MAKELEVEL = $(MAKELEVEL) + @echo THE END + ', +- ('CFLAGS=-O -w' . ($parallel_jobs ? '-j 2' : '')), ++ ('CFLAGS=-O -w' . ($parallel_jobs ? ' -j 2' : '')), + ($vos + ? "#MAKE#: Entering directory `#PWD#' + make 'CFLAGS=-O' -f #MAKEFILE# foo diff --git a/make.changes b/make.changes index 71d87da..a0b9e79 100644 --- a/make.changes +++ b/make.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/make.spec b/make.spec index 6e97c2b..85a82ab 100644 --- a/make.spec +++ b/make.spec @@ -26,29 +26,23 @@ Provides: gmake PreReq: %install_info_prereq AutoReqProv: on Version: 3.81 -Release: 129 +Release: 130 Summary: GNU make Source: make-3.81.tar.bz2 Patch1: make-memory-hog-2.diff Patch2: make-slowdown-parallelism.diff +Patch3: make-fix-testcase.patch Patch64: make-library-search-path.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The GNU make command with extensive documentation. - - -Authors: --------- - Richard Stallman - Roland McGrath - Paul Smith - %prep %setup #%patch1 -p1 %patch2 +%patch3 -p1 if [ %_lib == lib64 ]; then %patch64 fi