From 0b223c6fe8c241030e779e4ea5abd509a4416e46 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Feb 04 2023 14:03:09 +0000 Subject: restore the ld.so.conf.d file to workaround mock issue (#2166028) --- diff --git a/ghc.spec b/ghc.spec index 48549d2..e242e3a 100644 --- a/ghc.spec +++ b/ghc.spec @@ -88,7 +88,7 @@ Version: 9.2.5 # - 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: 125%{?dist} +Release: 126%{?dist} Summary: Glasgow Haskell Compiler License: BSD and HaskellReport @@ -586,12 +586,15 @@ sed -i -e 's!^library-dirs: %{ghclibdir}/rts!&\ndynamic-library-dirs: %{_ghcdynl %if %{defined _ghcdynlibdir} %if "%_ghcdynlibdir" != "%_libdir" mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d -echo "%{ghclibplatform}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}.conf +echo "%{_ghcdynlibdir}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}.conf %endif -# avoid 'E: binary-or-shlib-defines-rpath' for i in $(find %{buildroot} -type f -executable -exec sh -c "file {} | grep -q 'dynamically linked'" \; -print); do chrpath -d $i done +%else +# https://bugzilla.redhat.com/show_bug.cgi?id=2166028 +mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d +echo "%{ghclibplatform}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}.conf %endif # containers src moved to a subdir @@ -646,11 +649,9 @@ fi\ %merge_filelist rts base %endif -%if %{defined _ghcdynlibdir} -%if "%_ghcdynlibdir" != "%_libdir" +%if "%{?_ghcdynlibdir}" != "%_libdir" echo "%{_sysconfdir}/ld.so.conf.d/%{name}.conf" >> %{name}-base.files %endif -%endif # add rts libs %if %{with hadrian} @@ -984,6 +985,9 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index %changelog +* Sat Feb 4 2023 Jens Petersen - 9.2.5-126 +- add back ld.so.conf.d file to workaround mock install issue (#2166028) + * Mon Jan 30 2023 Jens Petersen - 9.2.5-125 - rebase to ghc-9.2.5 from ghc9.2 - fully Obsoletes ghc9.2*