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

define %ghcliblib and %ghclibplatform globally

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

3
ghc-rpm-macros.spec
View File

@ -185,8 +185,9 @@ EOF
%changelog
* Sat Dec 18 2021 Jens Petersen <petersen@redhat.com> - 2.3.2-1
- Cabal uses ppc64 in paths for ppc64le
- define ghcliblib and ghclibplatform globally
- fix ghc-deps.sh dependency generation for Hadrian
- Cabal uses ppc64 in paths for ppc64le
* Fri Dec 17 2021 Jens Petersen <petersen@redhat.com> - 2.3.1-1
- ghc_gen_filelists: support ghc Hadrian install

6
macros.ghc
View File

@ -72,14 +72,16 @@ ppc64\
%{_arch}\
%endif
%ghcliblib %{ghclibdir}%{?with_hadrian:/lib}
%ghclibplatform %{ghcliblib}%{?with_hadrian:/%{ghc_arch}-linux-ghc-%{ghc_version}}
# ghc_gen_filelists [name] [version]
%ghc_gen_filelists()\
%define pkgname %{?1}%{!?1:%{pkg_name}}\
%define pkgver %{?2}%{!?2:%{version}}\
%define pkgnamever %{pkgname}-%{pkgver}\
%define basepkg %{?ghc_name}%{!?ghc_name:ghc}-%{pkgname}\
%define ghcliblib %{ghclibdir}%{?with_hadrian:/lib}\
%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\