rpms/ghc
5
0
Fork 0
Code Issues Pull Requests Releases Activity

restore the ld.so.conf.d file to workaround mock issue (#2166028)

Browse Source
This commit is contained in:
Jens Petersen 2023-02-04 21:49:34 +08:00
parent e9399b13bb
commit 0b223c6fe8
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ghc.spec
View File

@ -88,7 +88,7 @@ Version: 9.2.5
# - release can only be reset if *all* library versions get bumped simultaneously # - release can only be reset if *all* library versions get bumped simultaneously
# (sometimes after a major release) # (sometimes after a major release)
# - minor release numbers for a branch should be incremented monotonically # - minor release numbers for a branch should be incremented monotonically
Release: 125%{?dist} Release: 126%{?dist}
Summary: Glasgow Haskell Compiler Summary: Glasgow Haskell Compiler
License: BSD and HaskellReport License: BSD and HaskellReport
@ -586,12 +586,15 @@ sed -i -e 's!^library-dirs: %{ghclibdir}/rts!&\ndynamic-library-dirs: %{_ghcdynl
%if %{defined _ghcdynlibdir} %if %{defined _ghcdynlibdir}
%if "%_ghcdynlibdir" != "%_libdir" %if "%_ghcdynlibdir" != "%_libdir"
mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d 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 %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 for i in $(find %{buildroot} -type f -executable -exec sh -c "file {} | grep -q 'dynamically linked'" \; -print); do
chrpath -d $i chrpath -d $i
done 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 %endif
# containers src moved to a subdir # containers src moved to a subdir
@ -646,11 +649,9 @@ fi\
%merge_filelist rts base %merge_filelist rts base
%endif %endif
%if %{defined _ghcdynlibdir} %if "%{?_ghcdynlibdir}" != "%_libdir"
%if "%_ghcdynlibdir" != "%_libdir"
echo "%{_sysconfdir}/ld.so.conf.d/%{name}.conf" >> %{name}-base.files echo "%{_sysconfdir}/ld.so.conf.d/%{name}.conf" >> %{name}-base.files
%endif %endif
%endif
# add rts libs # add rts libs
%if %{with hadrian} %if %{with hadrian}
@ -984,6 +985,9 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
%changelog %changelog
* Sat Feb 4 2023 Jens Petersen <petersen@redhat.com> - 9.2.5-126
- add back ld.so.conf.d file to workaround mock install issue (#2166028)
* Mon Jan 30 2023 Jens Petersen <petersen@redhat.com> - 9.2.5-125 * Mon Jan 30 2023 Jens Petersen <petersen@redhat.com> - 9.2.5-125
- rebase to ghc-9.2.5 from ghc9.2 - rebase to ghc-9.2.5 from ghc9.2
- fully Obsoletes ghc9.2* - fully Obsoletes ghc9.2*