Add host lib dirs to ld.so.conf

This commit is contained in:
Sandro Mani 2022-05-03 15:46:35 +02:00
parent a723557d96
commit 38c14c17cd
3 changed files with 14 additions and 1 deletions

View File

@ -6,7 +6,7 @@
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
Name: mingw-filesystem Name: mingw-filesystem
Version: 134 Version: 135
Release: 1%{?dist} Release: 1%{?dist}
Summary: MinGW cross compiler base filesystem and environment Summary: MinGW cross compiler base filesystem and environment
@ -47,6 +47,8 @@ Source25: toolchain-ucrt64.meson
Source26: pkgconf-personality-mingw32 Source26: pkgconf-personality-mingw32
Source27: pkgconf-personality-mingw64 Source27: pkgconf-personality-mingw64
Source28: pkgconf-personality-ucrt64 Source28: pkgconf-personality-ucrt64
Source29: mingw32-hostlib.conf
Source30: mingw64-hostlib.conf
# Taken from the Fedora filesystem package # Taken from the Fedora filesystem package
Source101: https://fedorahosted.org/filesystem/browser/lang-exceptions Source101: https://fedorahosted.org/filesystem/browser/lang-exceptions
@ -366,6 +368,10 @@ install -m 0644 %{SOURCE26} %{buildroot}%{pkgconfig_personalitydir}/i686-w64-min
install -m 0644 %{SOURCE27} %{buildroot}%{pkgconfig_personalitydir}/x86_64-w64-mingw32.personality install -m 0644 %{SOURCE27} %{buildroot}%{pkgconfig_personalitydir}/x86_64-w64-mingw32.personality
install -m 0644 %{SOURCE28} %{buildroot}%{pkgconfig_personalitydir}/x86_64-w64-mingw32ucrt.personality install -m 0644 %{SOURCE28} %{buildroot}%{pkgconfig_personalitydir}/x86_64-w64-mingw32ucrt.personality
mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
install -m 0644 %{SOURCE29} %{buildroot}%{_sysconfdir}/ld.so.conf.d/mingw32-hostlib.conf
install -m 0644 %{SOURCE30} %{buildroot}%{_sysconfdir}/ld.so.conf.d/mingw64-hostlib.conf
# Link mingw-pkg-config man pages to pkgconf(1) # Link mingw-pkg-config man pages to pkgconf(1)
mkdir -p %{buildroot}%{_mandir}/man1/ mkdir -p %{buildroot}%{_mandir}/man1/
echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/i686-w64-mingw32-pkg-config.1 echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/i686-w64-mingw32-pkg-config.1
@ -397,6 +403,7 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
%{_datadir}/mingw/toolchain-mingw32.meson %{_datadir}/mingw/toolchain-mingw32.meson
%{pkgconfig_personalitydir}/i686-w64-mingw32.personality %{pkgconfig_personalitydir}/i686-w64-mingw32.personality
%{_mandir}/man1/i686-w64-mingw32-pkg-config.1* %{_mandir}/man1/i686-w64-mingw32-pkg-config.1*
%{_sysconfdir}/ld.so.conf.d/mingw32-hostlib.conf
%dir %{_prefix}/lib/debug/%{_prefix} %dir %{_prefix}/lib/debug/%{_prefix}
%dir %{_prefix}/lib/debug/%{_prefix}/i686-w64-mingw32 %dir %{_prefix}/lib/debug/%{_prefix}/i686-w64-mingw32
@ -416,6 +423,7 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
%{_datadir}/mingw/toolchain-mingw64.meson %{_datadir}/mingw/toolchain-mingw64.meson
%{pkgconfig_personalitydir}/x86_64-w64-mingw32.personality %{pkgconfig_personalitydir}/x86_64-w64-mingw32.personality
%{_mandir}/man1/x86_64-w64-mingw32-pkg-config.1* %{_mandir}/man1/x86_64-w64-mingw32-pkg-config.1*
%{_sysconfdir}/ld.so.conf.d/mingw64-hostlib.conf
%dir %{_prefix}/lib/debug/%{_prefix} %dir %{_prefix}/lib/debug/%{_prefix}
%dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32
@ -439,6 +447,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
%dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
%changelog %changelog
* Tue May 03 2022 Sandro Mani <manisandro@gmail.com> - 135-1
- Add host lib dirs to ld.so.conf
* Thu Apr 28 2022 Sandro Mani <manisandro@gmail.com> - 134-1 * Thu Apr 28 2022 Sandro Mani <manisandro@gmail.com> - 134-1
- Regenerate standard-dlls - Regenerate standard-dlls

1
mingw32-hostlib.conf Normal file
View File

@ -0,0 +1 @@
/usr/i686-w64-mingw32/lib/

1
mingw64-hostlib.conf Normal file
View File

@ -0,0 +1 @@
/usr/x86_64-w64-mingw32/lib/