From 430af17a2ca983e57a7105286f8c4cc980e2a25c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 19 Dec 2021 01:28:18 +0800 Subject: [PATCH] define %ghcliblib and %ghclibplatform globally --- ghc-rpm-macros.spec | 3 ++- macros.ghc | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index d220153..a8cb807 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -185,8 +185,9 @@ EOF %changelog * Sat Dec 18 2021 Jens Petersen - 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 - 2.3.1-1 - ghc_gen_filelists: support ghc Hadrian install diff --git a/macros.ghc b/macros.ghc index 21832d8..a88cbbb 100644 --- a/macros.ghc +++ b/macros.ghc @@ -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\