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
This commit is contained in:
Peter Trommler
2014-10-21 09:26:28 +00:00
committed by Git OBS Bridge
parent a4030b3875
commit cb64c79fdc
2 changed files with 8 additions and 3 deletions

View File

@@ -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

View File

@@ -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}