From 4b86c176dbf3b200e7652e0de0d2176d0985981e4738939468e4d3a1d36638a3 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 10 Oct 2011 13:48:55 +0000 Subject: [PATCH] Accepting request 87178 from home:rudi_m:branches:Base:System re-submit #86758 including changelog OBS-URL: https://build.opensuse.org/request/show/87178 OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=42 --- xz.changes | 5 +++++ xz.spec | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/xz.changes b/xz.changes index 60428b7..236ba5c 100644 --- a/xz.changes +++ b/xz.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Oct 9 15:25:02 UTC 2011 - sweet_f_a@gmx.de + +- rewrite last broken arm portability changes + ------------------------------------------------------------------- Fri Sep 30 20:31:59 UTC 2011 - crrodriguez@opensuse.org diff --git a/xz.spec b/xz.spec index 05056b7..2303f4b 100644 --- a/xz.spec +++ b/xz.spec @@ -34,6 +34,9 @@ Obsoletes: lzma < %version %if 0%{?suse_version} < 1130 %define do_profiling 0 %endif +%ifarch %{arm} +%define do_profiling 0 +%endif %if 0%{?lang_package:1} > 0 Recommends: %name-lang @@ -87,14 +90,14 @@ compiling programs using the LZMA library. %setup -q %build -%ifnarch %{arm} && %{do_profiling} +%if %{do_profiling} profiledir=$(mktemp -d) trap "rm -rf $profiledir" EXIT export CFLAGS="%optflags %{cflags_profile_generate}=$profiledir" %endif -%configure --libdir=/%{_lib} --disable-static --with-pic --docdir=%_docdir/%name || cat config.log +%configure --libdir=/%{_lib} --disable-static --with-pic --docdir=%_docdir/%name make %{?_smp_mflags} -%ifnarch %{arm} && %{do_profiling} +%if %{do_profiling} time make check make clean export CFLAGS="%optflags %{cflags_profile_feedback}=$profiledir"