rpms/ghc-rpm-macros
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixup ghc_arch renaming it to Cabal_arch

Browse Source
This commit is contained in:
Jens Petersen 2021-12-19 10:05:10 +08:00
parent 430af17a2c
commit 8b135f0a25
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ghc-rpm-macros.spec
View File

@ -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 <petersen@redhat.com> - 2.3.3-1
- fixup ghc_arch renaming it to Cabal_arch
* Sat Dec 18 2021 Jens Petersen <petersen@redhat.com> - 2.3.2-1
- define ghcliblib and ghclibplatform globally
- fix ghc-deps.sh dependency generation for Hadrian

9
macros.ghc
View File

@ -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()\