From 7911366a63285ff0e6e9544f38f418b2e0e954212ff61bdc5131c628dd18564b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Fri, 30 Sep 2011 22:46:15 +0000
Subject: [PATCH] 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
---
 make-3.82-full-ar-path.patch | 13 +++++++++++++
 make.changes                 |  5 +++++
 make.spec                    |  4 ++++
 3 files changed, 22 insertions(+)
 create 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
new file mode 100644
index 0000000..9d436d3
--- /dev/null
+++ b/make-3.82-full-ar-path.patch
@@ -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)',
diff --git a/make.changes b/make.changes
index 359999e..aec5a74 100644
--- a/make.changes
+++ b/make.changes
@@ -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
 
diff --git a/make.spec b/make.spec
index 45d20f4..e1166e7 100644
--- a/make.spec
+++ b/make.spec
@@ -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 \