From 10f51bb9412fa7a2c955894e2284615274c08fb39fbf7bb4b0ad6c077428b2ee Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 11 Oct 2011 21:22:49 +0000 Subject: [PATCH] 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 --- make-3.82-full-ar-path.patch | 13 ------------- make.changes | 5 +++++ make.spec | 4 ---- 3 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 make-3.82-full-ar-path.patch diff --git a/make-3.82-full-ar-path.patch b/make-3.82-full-ar-path.patch deleted file mode 100644 index 9d436d3..0000000 --- a/make-3.82-full-ar-path.patch +++ /dev/null @@ -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)', diff --git a/make.changes b/make.changes index aec5a74..07f4284 100644 --- a/make.changes +++ b/make.changes @@ -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 diff --git a/make.spec b/make.spec index e1166e7..45d20f4 100644 --- a/make.spec +++ b/make.spec @@ -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 \