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

move Cabal_arch into ghclibplatform macro

Browse Source
This commit is contained in:
Jens Petersen 2021-12-19 10:47:11 +08:00
parent 8b135f0a25
commit f75a976e04
2 changed files with 5 additions and 5 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 %endif
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 2.3.3 Version: 2.3.4
Release: 1%{?dist} Release: 1%{?dist}
Summary: RPM macros for building Haskell packages for GHC Summary: RPM macros for building Haskell packages for GHC
@ -184,6 +184,9 @@ EOF
%changelog %changelog
* Sun Dec 19 2021 Jens Petersen <petersen@redhat.com> - 2.3.4-1
- move Cabal_arch into ghclibplatform macro
* Sun Dec 19 2021 Jens Petersen <petersen@redhat.com> - 2.3.3-1 * Sun Dec 19 2021 Jens Petersen <petersen@redhat.com> - 2.3.3-1
- fixup ghc_arch renaming it to Cabal_arch - fixup ghc_arch renaming it to Cabal_arch

5
macros.ghc
View File

@ -64,12 +64,9 @@ fi\
%_ghclicensedir %{?_defaultlicensedir}%{!?_defaultlicensedir:%_docdir} %_ghclicensedir %{?_defaultlicensedir}%{!?_defaultlicensedir:%_docdir}
# needed for Cabal ppc64le
%Cabal_arch %(arch | sed -e "s/ppc64le/ppc64/")
%ghcliblib %{ghclibdir}%{?with_hadrian:/lib} %ghcliblib %{ghclibdir}%{?with_hadrian:/lib}
%ghclibplatform %{ghcliblib}%{?with_hadrian:/%{Cabal_arch}-linux-ghc-%{ghc_version}} %ghclibplatform %{ghcliblib}%{?with_hadrian:/%(arch | sed -e "s/ppc64le/ppc64/")-linux-ghc-%{ghc_version}}
# ghc_gen_filelists [name] [version] # ghc_gen_filelists [name] [version]
%ghc_gen_filelists()\ %ghc_gen_filelists()\