Cabal uses ppc64 in paths instead of ppc64le
This commit is contained in:
parent
3f7e41039a
commit
839272fa3a
@ -7,7 +7,7 @@
|
||||
%endif
|
||||
|
||||
Name: ghc-rpm-macros
|
||||
Version: 2.3.1
|
||||
Version: 2.3.2
|
||||
Release: 1%{?dist}
|
||||
Summary: RPM macros for building Haskell packages for GHC
|
||||
|
||||
@ -184,6 +184,9 @@ EOF
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Dec 18 2021 Jens Petersen <petersen@redhat.com> - 2.3.2-1
|
||||
- Cabal uses ppc64 in paths for ppc64le
|
||||
|
||||
* Fri Dec 17 2021 Jens Petersen <petersen@redhat.com> - 2.3.1-1
|
||||
- ghc_gen_filelists: support ghc Hadrian install
|
||||
|
||||
|
10
macros.ghc
10
macros.ghc
@ -64,6 +64,14 @@ fi\
|
||||
|
||||
%_ghclicensedir %{?_defaultlicensedir}%{!?_defaultlicensedir:%_docdir}
|
||||
|
||||
# needed for Cabal ppc64le
|
||||
%ghc_arch\
|
||||
%ifarch ppc64le\
|
||||
ppc64\
|
||||
%else\
|
||||
%{_arch}\
|
||||
%endif
|
||||
|
||||
# ghc_gen_filelists [name] [version]
|
||||
%ghc_gen_filelists()\
|
||||
%define pkgname %{?1}%{!?1:%{pkg_name}}\
|
||||
@ -71,7 +79,7 @@ fi\
|
||||
%define pkgnamever %{pkgname}-%{pkgver}\
|
||||
%define basepkg %{?ghc_name}%{!?ghc_name:ghc}-%{pkgname}\
|
||||
%define ghcliblib %{ghclibdir}%{?with_hadrian:/lib}\
|
||||
%define ghclibplatform %{ghcliblib}%{?with_hadrian:/%{_arch}-linux-ghc-%{ghc_version}}\
|
||||
%define ghclibplatform %{ghcliblib}%{?with_hadrian:/%{ghc_arch}-linux-ghc-%{ghc_version}}\
|
||||
if [ -z "$(ls %{buildroot}%{ghcliblib}/package.conf.d/%{pkgnamever}*.conf)" ]; then\
|
||||
echo '%{buildroot}%{ghcliblib}/package.conf.d/%{pkgnamever}*.conf not found'\
|
||||
exit 1\
|
||||
|
Loading…
Reference in New Issue
Block a user