define %ghcliblib and %ghclibplatform globally
This commit is contained in:
parent
ac98514a64
commit
430af17a2c
@ -185,8 +185,9 @@ EOF
|
|||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Sat Dec 18 2021 Jens Petersen <petersen@redhat.com> - 2.3.2-1
|
* 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
|
- 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
|
* Fri Dec 17 2021 Jens Petersen <petersen@redhat.com> - 2.3.1-1
|
||||||
- ghc_gen_filelists: support ghc Hadrian install
|
- ghc_gen_filelists: support ghc Hadrian install
|
||||||
|
@ -72,14 +72,16 @@ ppc64\
|
|||||||
%{_arch}\
|
%{_arch}\
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%ghcliblib %{ghclibdir}%{?with_hadrian:/lib}
|
||||||
|
|
||||||
|
%ghclibplatform %{ghcliblib}%{?with_hadrian:/%{ghc_arch}-linux-ghc-%{ghc_version}}
|
||||||
|
|
||||||
# ghc_gen_filelists [name] [version]
|
# ghc_gen_filelists [name] [version]
|
||||||
%ghc_gen_filelists()\
|
%ghc_gen_filelists()\
|
||||||
%define pkgname %{?1}%{!?1:%{pkg_name}}\
|
%define pkgname %{?1}%{!?1:%{pkg_name}}\
|
||||||
%define pkgver %{?2}%{!?2:%{version}}\
|
%define pkgver %{?2}%{!?2:%{version}}\
|
||||||
%define pkgnamever %{pkgname}-%{pkgver}\
|
%define pkgnamever %{pkgname}-%{pkgver}\
|
||||||
%define basepkg %{?ghc_name}%{!?ghc_name:ghc}-%{pkgname}\
|
%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\
|
if [ -z "$(ls %{buildroot}%{ghcliblib}/package.conf.d/%{pkgnamever}*.conf)" ]; then\
|
||||||
echo '%{buildroot}%{ghcliblib}/package.conf.d/%{pkgnamever}*.conf not found'\
|
echo '%{buildroot}%{ghcliblib}/package.conf.d/%{pkgnamever}*.conf not found'\
|
||||||
exit 1\
|
exit 1\
|
||||||
|
Loading…
Reference in New Issue
Block a user