From 0017f57fc442e53c1d57b9e929576cfab5f37d2b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 21 Jan 2023 15:38:01 +0800 Subject: [PATCH] setup _ghcdynlibdir from spec file for current releases --- ghc-rpm-macros.spec | 4 ++++ macros.ghc-os | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 034a1ce..32fe9a2 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -130,6 +130,10 @@ install -p -D -m 0644 %{SOURCE0} %{buildroot}%{macros_dir}/macros.ghc install -p -D -m 0644 %{SOURCE6} %{buildroot}%{macros_dir}/macros.ghc-extra install -p -D -m 0644 %{SOURCE9} %{buildroot}%{macros_dir}/macros.ghc-os +%if 0%{?fedora} < 38 +echo -e "\n%%_ghcdynlibdir %%{_libdir}" >> %{buildroot}%{macros_dir}/macros.ghc-os +%endif + install -p -D -m 0755 %{SOURCE3} %{buildroot}%{_prefix}/lib/rpm/ghc-deps.sh %if 0%{?fedora} || 0%{?rhel} >= 7 diff --git a/macros.ghc-os b/macros.ghc-os index f18c86f..2aba8af 100644 --- a/macros.ghc-os +++ b/macros.ghc-os @@ -2,8 +2,6 @@ %_ghcdocdir %{_ghclicensedir}/%{name} -# %%_ghcdynlibdir %%{_libdir}/ghc-%%{ghc_version} - %ghc_without_dynamic 1 # enable profiling libraries in prof subpkgs