The package rpms/ghc-rpm-macros.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ghc-rpm-macros.git/commit/?id=872....
Change:
+%ifarch ppc64le
Thanks.
Full change:
============
commit eb9b908b89e69d00b233d1affa321b134c867d93
Author: Jens Petersen <petersen(a)redhat.com>
Date: Sat Dec 18 23:29:58 2021 +0800
use ghclibplatform path for dependency generation for Hadrian
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index e1c7a34..d220153 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -186,6 +186,7 @@ EOF
%changelog
* Sat Dec 18 2021 Jens Petersen <petersen(a)redhat.com> - 2.3.2-1
- Cabal uses ppc64 in paths for ppc64le
+- fix ghc-deps.sh dependency generation for Hadrian
* Fri Dec 17 2021 Jens Petersen <petersen(a)redhat.com> - 2.3.1-1
- ghc_gen_filelists: support ghc Hadrian install
diff --git a/ghc.attr b/ghc.attr
index 5626da0..59194f6 100644
--- a/ghc.attr
+++ b/ghc.attr
@@ -1,3 +1,3 @@
-%__ghc_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir}
%{?ghc_name}
-%__ghc_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}
%{?ghc_name}
-%__ghc_path ^%{ghclibdir}/(.*/libHS.*_p\.a|package.conf.d/.*\.conf)$
+%__ghc_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibplatform}
%{?ghc_name:ghc-%{ghc_version}}
+%__ghc_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibplatform}
%{?ghc_name:ghc-%{ghc_version}}
+%__ghc_path ^%{ghclibplatform}/(.*/libHS.*_p\.a|package.conf.d/.*\.conf)$
commit 87215d35b028b3b7d3f678a03118980e379e7e44
Author: Jens Petersen <petersen(a)redhat.com>
Date: Sat Dec 18 23:26:44 2021 +0800
Cabal uses ppc64 in paths instead of ppc64le
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 73af020..e1c7a34 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -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(a)redhat.com> - 2.3.2-1
+- Cabal uses ppc64 in paths for ppc64le
+
* Fri Dec 17 2021 Jens Petersen <petersen(a)redhat.com> - 2.3.1-1
- ghc_gen_filelists: support ghc Hadrian install
diff --git a/macros.ghc b/macros.ghc
index e18da4e..0a1d1ac 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -64,6 +64,13 @@ fi\
%_ghclicensedir %{?_defaultlicensedir}%{!?_defaultlicensedir:%_docdir}
+# needed for Cabal ppc64le
+%ifarch ppc64le
+%ghc_arch ppc64
+%else
+%ghc_arch %{_arch}
+%endif
+
# ghc_gen_filelists [name] [version]
%ghc_gen_filelists()\
%define pkgname %{?1}%{!?1:%{pkg_name}}\
@@ -71,7 +78,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\