From 38c14c17cd100a7bf9d5a3b96a4b44f55d0ed264 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: May 03 2022 13:46:35 +0000 Subject: Add host lib dirs to ld.so.conf --- diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index 91b702d..22bc10c 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -6,7 +6,7 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: mingw-filesystem -Version: 134 +Version: 135 Release: 1%{?dist} Summary: MinGW cross compiler base filesystem and environment @@ -47,6 +47,8 @@ Source25: toolchain-ucrt64.meson Source26: pkgconf-personality-mingw32 Source27: pkgconf-personality-mingw64 Source28: pkgconf-personality-ucrt64 +Source29: mingw32-hostlib.conf +Source30: mingw64-hostlib.conf # Taken from the Fedora filesystem package 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 %{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) mkdir -p %{buildroot}%{_mandir}/man1/ 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 %{pkgconfig_personalitydir}/i686-w64-mingw32.personality %{_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}/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 %{pkgconfig_personalitydir}/x86_64-w64-mingw32.personality %{_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}/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 %changelog +* Tue May 03 2022 Sandro Mani - 135-1 +- Add host lib dirs to ld.so.conf + * Thu Apr 28 2022 Sandro Mani - 134-1 - Regenerate standard-dlls diff --git a/mingw32-hostlib.conf b/mingw32-hostlib.conf new file mode 100644 index 0000000..c00dd5d --- /dev/null +++ b/mingw32-hostlib.conf @@ -0,0 +1 @@ +/usr/i686-w64-mingw32/lib/ diff --git a/mingw64-hostlib.conf b/mingw64-hostlib.conf new file mode 100644 index 0000000..0defb02 --- /dev/null +++ b/mingw64-hostlib.conf @@ -0,0 +1 @@ +/usr/x86_64-w64-mingw32/lib/