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

ghclibplatform: Cabal calls i686 as i386

Browse Source
This commit is contained in:
Jens Petersen 2021-12-20 03:05:20 +08:00
parent 5136c98a2f
commit ad76ca4d4c
2 changed files with 6 additions and 2 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.6 Version: 2.3.7
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
* Mon Dec 20 2021 Jens Petersen <petersen@redhat.com> - 2.3.7-1
- ghclibplatform: Cabal uses i386 for i686
* Mon Dec 20 2021 Jens Petersen <petersen@redhat.com> - 2.3.6-1 * Mon Dec 20 2021 Jens Petersen <petersen@redhat.com> - 2.3.6-1
- fix missing Hadrian ghc dependency generation - fix missing Hadrian ghc dependency generation

3
macros.ghc
View File

@ -66,7 +66,8 @@ fi\
%ghcliblib %{ghclibdir}%{?with_hadrian:/lib} %ghcliblib %{ghclibdir}%{?with_hadrian:/lib}
%ghclibplatform %{ghcliblib}%{?with_hadrian:/%(arch | sed -e "s/ppc64le/ppc64/")-linux-ghc-%{ghc_version}} # Cabal has specific arch names
%ghclibplatform %{ghcliblib}%{?with_hadrian:/%(arch | sed -e "s/ppc64le/ppc64/" -e "s/i686/i386/")-linux-ghc-%{ghc_version}}
# ghc_gen_filelists [name] [version] # ghc_gen_filelists [name] [version]
%ghc_gen_filelists()\ %ghc_gen_filelists()\