diff --git a/ghc.spec b/ghc.spec index b8146ce..409fb70 100644 --- a/ghc.spec +++ b/ghc.spec @@ -44,7 +44,7 @@ Version: 8.8.4 # - release can only be reset if *all* library versions get bumped simultaneously # (sometimes after a major release) # - minor release numbers for a branch should be incremented monotonically -Release: 112%{?dist} +Release: 113%{?dist} Summary: Glasgow Haskell Compiler License: BSD and HaskellReport @@ -555,6 +555,12 @@ sed -i -e "s!$PWD/llvm-%{llvm_version}.src/_build!%{ghclibdir}/llvm!" %{buildroo # Remove opt-viewer, since this is just a compatibility package. rm -r %{buildroot}%{ghclibdir}/llvm/share/opt-viewer + +# Create ld.so.conf.d entry +mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d +cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf << EOF +%{ghclibdir}/llvm/lib +EOF %endif @@ -661,6 +667,7 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index %{ghclibdir}/bin/ghc-iserv-dyn %ifarch %{ghc_llvm_archs} %license llvm-%{llvm_version}.src/LICENSE.TXT +%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf %{ghclibdir}/llvm %endif %if %{with ghc_prof} @@ -738,6 +745,9 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index %changelog +* Tue Jun 22 2021 Jens Petersen - 8.8.4-113 +- add ld.so.conf for bundled aarch64 llvm libs (#1918080) + * Sat Jun 19 2021 Jens Petersen - 8.8.4-112 - remove llvm opt-viewer since it uses python2.7 - use LLC and OPT to configure llvm paths