diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index a8cb807..f1adbaf 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -7,7 +7,7 @@ %endif Name: ghc-rpm-macros -Version: 2.3.2 +Version: 2.3.3 Release: 1%{?dist} Summary: RPM macros for building Haskell packages for GHC @@ -184,6 +184,9 @@ EOF %changelog +* Sun Dec 19 2021 Jens Petersen - 2.3.3-1 +- fixup ghc_arch renaming it to Cabal_arch + * Sat Dec 18 2021 Jens Petersen - 2.3.2-1 - define ghcliblib and ghclibplatform globally - fix ghc-deps.sh dependency generation for Hadrian diff --git a/macros.ghc b/macros.ghc index a88cbbb..9e13dfb 100644 --- a/macros.ghc +++ b/macros.ghc @@ -65,16 +65,11 @@ fi\ %_ghclicensedir %{?_defaultlicensedir}%{!?_defaultlicensedir:%_docdir} # needed for Cabal ppc64le -%ghc_arch\ -%ifarch ppc64le\ -ppc64\ -%else\ -%{_arch}\ -%endif +%Cabal_arch %(arch | sed -e "s/ppc64le/ppc64/") %ghcliblib %{ghclibdir}%{?with_hadrian:/lib} -%ghclibplatform %{ghcliblib}%{?with_hadrian:/%{ghc_arch}-linux-ghc-%{ghc_version}} +%ghclibplatform %{ghcliblib}%{?with_hadrian:/%{Cabal_arch}-linux-ghc-%{ghc_version}} # ghc_gen_filelists [name] [version] %ghc_gen_filelists()\