Accepting request 85789 from home:-miska-

fixed build on arm

OBS-URL: https://build.opensuse.org/request/show/85789
OBS-URL: https://build.opensuse.org/package/show/Base:System/make?expand=0&rev=17
This commit is contained in:
Cristian Rodríguez 2011-09-30 22:46:15 +00:00 committed by Git OBS Bridge
parent ab883200e0
commit 7911366a63
3 changed files with 22 additions and 0 deletions

View File

@ -0,0 +1,13 @@
Index: tests/scripts/features/archives
===================================================================
--- tests/scripts/features/archives.orig
+++ tests/scripts/features/archives
@@ -13,7 +13,7 @@ utouch(-60, qw(a1.o a2.o a3.o));
# Very simple
run_make_test('all: libxx.a(a1.o)',
- '', "ar rv libxx.a a1.o\nar: creating libxx.a\na - a1.o\n");
+ '', "ar rv libxx.a a1.o\n/usr/bin/ar: creating libxx.a\na - a1.o\n");
# Multiple .o's. Add a new one to the existing library
run_make_test('all: libxx.a(a1.o a2.o)',

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
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

View File

@ -35,6 +35,7 @@ Patch4: make-savannah-bug30723-expand_makeflags_before_reexec.diff
Patch5: make-savannah-bug30612-handling_of_archives.diff
Patch6: make-fix_whitespace_tokenization.diff
Patch64: make-library-search-path.diff
Patch7: make-3.82-full-ar-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -50,6 +51,9 @@ The GNU make command with extensive documentation.
if [ %_lib == lib64 ]; then
%patch64
fi
%ifarch %arm
%patch7
%endif
%build
CFLAGS=$RPM_OPT_FLAGS \