SHA256
1
0
forked from pool/make

Accepting request 87451 from home:-miska-

refixing arm build

OBS-URL: https://build.opensuse.org/request/show/87451
OBS-URL: https://build.opensuse.org/package/show/Base:System/make?expand=0&rev=19
This commit is contained in:
Dirk Mueller 2011-10-11 21:22:49 +00:00 committed by Git OBS Bridge
parent 7911366a63
commit 10f51bb941
3 changed files with 5 additions and 17 deletions

View File

@ -1,13 +0,0 @@
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 @@
-------------------------------------------------------------------
Tue Oct 11 22:37:40 CEST 2011 - mhrusecky@suse.cz
- reverting previous change (qemu binfmt was fixed)
-------------------------------------------------------------------
Fri Sep 30 13:03:23 CEST 2011 - mhrusecky@suse.cz

View File

@ -35,7 +35,6 @@ 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
@ -51,9 +50,6 @@ The GNU make command with extensive documentation.
if [ %_lib == lib64 ]; then
%patch64
fi
%ifarch %arm
%patch7
%endif
%build
CFLAGS=$RPM_OPT_FLAGS \