From cb64c79fdcfac01133988d4d0dd1a53505e4a9aa57f3c12cb0aea757110ca9b3 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Tue, 21 Oct 2014 09:26:28 +0000 Subject: [PATCH] Accepting request 257772 from home:dirkmueller:branches:devel:languages:haskell - disable dependency on prelink for arm and aarch64 architectures OBS-URL: https://build.opensuse.org/request/show/257772 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-rpm-macros?expand=0&rev=34 --- ghc-rpm-macros.changes | 5 +++++ ghc-rpm-macros.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ghc-rpm-macros.changes b/ghc-rpm-macros.changes index 736394f..49af2be 100644 --- a/ghc-rpm-macros.changes +++ b/ghc-rpm-macros.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 12 13:11:17 UTC 2014 - dmueller@suse.com + +- disable dependency on prelink for arm and aarch64 architectures + ------------------------------------------------------------------- Thu Jul 31 16:10:06 UTC 2014 - dimstar@opensuse.org diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 7339993..0008150 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -50,7 +50,7 @@ Patch100: sle-sp1-rpmdeps.patch BuildRequires: xz Requires: ghc-srpm-macros = %{version}-%{release} -%ifnarch ppc64le +%ifnarch ppc64le aarch64 %arm # for execstack Requires: prelink %endif @@ -99,8 +99,8 @@ Macros used when generating source Haskell rpm packages. %patch3 -p1 %patch4 -p1 %patch5 -p1 -# remove when prelink is available on ppc64le -%ifarch ppc64le +# remove when prelink is available on any of those architectures +%ifarch ppc64le aarch64 %arm %patch6 -p1 %endif %if 0%{?sles_version}