From 2453ef048d0a98802b5971bfcd79322aab20856e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 07:36:27 +0000 Subject: [PATCH 01/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mingw-filesystem.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index cb8a240..77a11e1 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -10,7 +10,7 @@ Name: mingw-filesystem Version: 148 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW cross compiler base filesystem and environment License: GPL-2.0-or-later @@ -378,6 +378,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 148-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Sep 13 2023 Orion Poplawski - 148-1 - Add pkgconfig provides From c5baad7c9b4a51da7f7ed977bc97043db9dee5ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 06:29:46 +0000 Subject: [PATCH 02/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mingw-filesystem.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index 77a11e1..f13a80e 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -10,7 +10,7 @@ Name: mingw-filesystem Version: 148 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW cross compiler base filesystem and environment License: GPL-2.0-or-later @@ -378,6 +378,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 148-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 148-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From e61f901d1148e879c8e085a82873ba5010e6c842 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 6 Jun 2024 20:23:48 +0200 Subject: [PATCH 03/13] Set __debug_package 1 in %mingw_debug_package --- macros.mingw | 1 + mingw-filesystem.spec | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/macros.mingw b/macros.mingw index 6118c46..d82abb3 100644 --- a/macros.mingw +++ b/macros.mingw @@ -17,6 +17,7 @@ %mingw_debug_install_post %{mingw_finddebuginfo} %{_builddir}/%{?buildsubdir} %{mingw_build_targets} %mingw_debug_package \ +%global __debug_package 1 \ %if 0%{?mingw_build_win32} == 1 \ %{?mingw32_debug_package} \ %endif \ diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index f13a80e..6e8499b 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -10,7 +10,7 @@ Name: mingw-filesystem Version: 148 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MinGW cross compiler base filesystem and environment License: GPL-2.0-or-later @@ -378,6 +378,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt %changelog +* Thu Jun 06 2024 Sandro Mani - 148-4 +- Set __debug_package 1 in %mingw_debug_package (#2284193) + * Thu Jan 25 2024 Fedora Release Engineering - 148-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b27ab1cc12d1e76eb5e255cdb0fe9bf179636b84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 12 Jun 2024 12:36:18 +0400 Subject: [PATCH 04/13] toolchain-mingw.meson: fix "Please do not put -C linker=" Rust warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drop linker=, let meson guess the associated C linker instead. Signed-off-by: Marc-André Lureau --- toolchain-mingw32.meson | 2 +- toolchain-mingw64.meson | 2 +- toolchain-ucrt64.meson | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/toolchain-mingw32.meson b/toolchain-mingw32.meson index 563565c..377dbac 100644 --- a/toolchain-mingw32.meson +++ b/toolchain-mingw32.meson @@ -2,7 +2,7 @@ c = 'i686-w64-mingw32-gcc' cpp = 'i686-w64-mingw32-g++' fortran = 'i686-w64-mingw32-gfortran' -rust = ['rustc', '--target', 'i686-pc-windows-msvc', '-C', 'linker=/usr/bin/i686-w64-mingw32-gcc'] +rust = ['rustc', '--target', 'i686-pc-windows-msvc'] ar = '/usr/bin/i686-w64-mingw32-ar' pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config' ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib' diff --git a/toolchain-mingw64.meson b/toolchain-mingw64.meson index 01d83ee..64ee74a 100644 --- a/toolchain-mingw64.meson +++ b/toolchain-mingw64.meson @@ -2,7 +2,7 @@ c = 'x86_64-w64-mingw32-gcc' cpp = 'x86_64-w64-mingw32-g++' fortran = 'x86_64-w64-mingw32-gfortran' -rust = ['rustc', '--target', 'x86_64-pc-windows-msvc', '-C', 'linker=/usr/bin/x86_64-w64-mingw32-gcc'] +rust = ['rustc', '--target', 'x86_64-pc-windows-msvc'] ar = '/usr/bin/x86_64-w64-mingw32-ar' pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config' ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib' diff --git a/toolchain-ucrt64.meson b/toolchain-ucrt64.meson index 8eb172b..0bc527f 100644 --- a/toolchain-ucrt64.meson +++ b/toolchain-ucrt64.meson @@ -2,7 +2,7 @@ c = 'x86_64-w64-mingw32ucrt-gcc' cpp = 'x86_64-w64-mingw32ucrt-g++' fortran = 'x86_64-w64-mingw32ucrt-gfortran' -rust = ['rustc', '--target', 'x86_64-pc-windows-msvc', '-C', 'linker=/usr/bin/x86_64-w64-mingw32ucrt-gcc'] +rust = ['rustc', '--target', 'x86_64-pc-windows-msvc'] ar = '/usr/bin/x86_64-w64-mingw32ucrt-ar' pkgconfig = '/usr/bin/x86_64-w64-mingw32ucrt-pkg-config' ranlib = '/usr/bin/x86_64-w64-mingw32ucrt-ranlib' From 4776ff00230bb119c0143050ce3a6af6b08ae176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 12 Jun 2024 13:03:51 +0400 Subject: [PATCH 05/13] toolchain-mingw.meson: use GNU toolchain, not MSVC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MSVC: unlikely to work :) Signed-off-by: Marc-André Lureau --- toolchain-mingw32.meson | 2 +- toolchain-mingw64.meson | 2 +- toolchain-ucrt64.meson | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/toolchain-mingw32.meson b/toolchain-mingw32.meson index 377dbac..9fc288e 100644 --- a/toolchain-mingw32.meson +++ b/toolchain-mingw32.meson @@ -2,7 +2,7 @@ c = 'i686-w64-mingw32-gcc' cpp = 'i686-w64-mingw32-g++' fortran = 'i686-w64-mingw32-gfortran' -rust = ['rustc', '--target', 'i686-pc-windows-msvc'] +rust = ['rustc', '--target', 'i686-pc-windows-gnu'] ar = '/usr/bin/i686-w64-mingw32-ar' pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config' ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib' diff --git a/toolchain-mingw64.meson b/toolchain-mingw64.meson index 64ee74a..6bbacc8 100644 --- a/toolchain-mingw64.meson +++ b/toolchain-mingw64.meson @@ -2,7 +2,7 @@ c = 'x86_64-w64-mingw32-gcc' cpp = 'x86_64-w64-mingw32-g++' fortran = 'x86_64-w64-mingw32-gfortran' -rust = ['rustc', '--target', 'x86_64-pc-windows-msvc'] +rust = ['rustc', '--target', 'x86_64-pc-windows-gnu'] ar = '/usr/bin/x86_64-w64-mingw32-ar' pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config' ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib' diff --git a/toolchain-ucrt64.meson b/toolchain-ucrt64.meson index 0bc527f..aa6020a 100644 --- a/toolchain-ucrt64.meson +++ b/toolchain-ucrt64.meson @@ -2,7 +2,9 @@ c = 'x86_64-w64-mingw32ucrt-gcc' cpp = 'x86_64-w64-mingw32ucrt-g++' fortran = 'x86_64-w64-mingw32ucrt-gfortran' -rust = ['rustc', '--target', 'x86_64-pc-windows-msvc'] +rust = ['rustc', '--target', 'x86_64-pc-windows-gnu'] +# XXX: there is no mingw/rustc target for UCRT yet, but this should do +rust_ld = 'x86_64-w64-mingw32ucrt-gcc' ar = '/usr/bin/x86_64-w64-mingw32ucrt-ar' pkgconfig = '/usr/bin/x86_64-w64-mingw32ucrt-pkg-config' ranlib = '/usr/bin/x86_64-w64-mingw32ucrt-ranlib' From 9f0c2b852a4068fdd6a5960de9449d8bfcbf7636 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 12 Jun 2024 11:14:39 +0200 Subject: [PATCH 06/13] Bump release --- mingw-filesystem.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index 6e8499b..a73f5a7 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -10,7 +10,7 @@ Name: mingw-filesystem Version: 148 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MinGW cross compiler base filesystem and environment License: GPL-2.0-or-later @@ -378,6 +378,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt %changelog +* Wed Jun 12 2024 Sandro Mani - 148-5 +- Rust fixes + * Thu Jun 06 2024 Sandro Mani - 148-4 - Set __debug_package 1 in %mingw_debug_package (#2284193) From 0481f87ac14248c165d843ecfda4116f40af856c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 17:29:06 +0000 Subject: [PATCH 07/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- mingw-filesystem.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index a73f5a7..8cdadfb 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -10,7 +10,7 @@ Name: mingw-filesystem Version: 148 -Release: 5%{?dist} +Release: 6%{?dist} Summary: MinGW cross compiler base filesystem and environment License: GPL-2.0-or-later @@ -378,6 +378,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 148-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jun 12 2024 Sandro Mani - 148-5 - Rust fixes From bc82ce5793d3c16b32e21057df29e9df26f41abd Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Sat, 7 Sep 2024 18:44:32 +0800 Subject: [PATCH 08/13] Fix meson deprecation warnings --- macros.mingw32 | 2 +- macros.mingw64 | 2 +- macros.ucrt64 | 2 +- mingw-filesystem.spec | 5 ++++- toolchain-mingw32.meson | 2 +- toolchain-mingw64.meson | 2 +- toolchain-ucrt64.meson | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/macros.mingw32 b/macros.mingw32 index 250675c..0b2a751 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -162,7 +162,7 @@ if test -f meson.build; then __mingw32_topdir=.; \\\ elif test -f ../meson.build; then __mingw32_topdir=..; \\\ else __mingw32_topdir=""; fi; \\\ - %__meson \\\ + %__meson setup \\\ --cross-file /usr/share/mingw/toolchain-mingw32.meson \\\ --default-library shared \\\ --prefix %{mingw32_prefix} \\\ diff --git a/macros.mingw64 b/macros.mingw64 index 493024d..4b96dc3 100644 --- a/macros.mingw64 +++ b/macros.mingw64 @@ -162,7 +162,7 @@ if test -f meson.build; then __mingw64_topdir=.; \\\ elif test -f ../meson.build; then __mingw64_topdir=..; \\\ else __mingw64_topdir=""; fi; \\\ - %__meson \\\ + %__meson setup \\\ --cross-file /usr/share/mingw/toolchain-mingw64.meson \\\ --default-library shared \\\ --prefix %{mingw64_prefix} \\\ diff --git a/macros.ucrt64 b/macros.ucrt64 index 28e13dc..9c0057a 100644 --- a/macros.ucrt64 +++ b/macros.ucrt64 @@ -158,7 +158,7 @@ if test -f meson.build; then __ucrt64_topdir=.; \\\ elif test -f ../meson.build; then __ucrt64_topdir=..; \\\ else __ucrt64_topdir=""; fi; \\\ - %__meson \\\ + %__meson setup \\\ --cross-file /usr/share/mingw/toolchain-ucrt64.meson \\\ --default-library shared \\\ --prefix %{ucrt64_prefix} \\\ diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index 8cdadfb..37c4eb1 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -10,7 +10,7 @@ Name: mingw-filesystem Version: 148 -Release: 6%{?dist} +Release: 7%{?dist} Summary: MinGW cross compiler base filesystem and environment License: GPL-2.0-or-later @@ -378,6 +378,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt %changelog +* Sat Sep 07 2024 Zephyr Lykos - 148-7 +- Fix meson deprecation warnings + * Thu Jul 18 2024 Fedora Release Engineering - 148-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/toolchain-mingw32.meson b/toolchain-mingw32.meson index 9fc288e..600a297 100644 --- a/toolchain-mingw32.meson +++ b/toolchain-mingw32.meson @@ -4,7 +4,7 @@ cpp = 'i686-w64-mingw32-g++' fortran = 'i686-w64-mingw32-gfortran' rust = ['rustc', '--target', 'i686-pc-windows-gnu'] ar = '/usr/bin/i686-w64-mingw32-ar' -pkgconfig = '/usr/bin/i686-w64-mingw32-pkg-config' +pkg-config = '/usr/bin/i686-w64-mingw32-pkg-config' ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib' strip = '/usr/bin/i686-w64-mingw32-strip' windres = '/usr/bin/i686-w64-mingw32-windres' diff --git a/toolchain-mingw64.meson b/toolchain-mingw64.meson index 6bbacc8..91298ec 100644 --- a/toolchain-mingw64.meson +++ b/toolchain-mingw64.meson @@ -4,7 +4,7 @@ cpp = 'x86_64-w64-mingw32-g++' fortran = 'x86_64-w64-mingw32-gfortran' rust = ['rustc', '--target', 'x86_64-pc-windows-gnu'] ar = '/usr/bin/x86_64-w64-mingw32-ar' -pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config' +pkg-config = '/usr/bin/x86_64-w64-mingw32-pkg-config' ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib' strip = '/usr/bin/x86_64-w64-mingw32-strip' windres = '/usr/bin/x86_64-w64-mingw32-windres' diff --git a/toolchain-ucrt64.meson b/toolchain-ucrt64.meson index aa6020a..0834d2a 100644 --- a/toolchain-ucrt64.meson +++ b/toolchain-ucrt64.meson @@ -6,7 +6,7 @@ rust = ['rustc', '--target', 'x86_64-pc-windows-gnu'] # XXX: there is no mingw/rustc target for UCRT yet, but this should do rust_ld = 'x86_64-w64-mingw32ucrt-gcc' ar = '/usr/bin/x86_64-w64-mingw32ucrt-ar' -pkgconfig = '/usr/bin/x86_64-w64-mingw32ucrt-pkg-config' +pkg-config = '/usr/bin/x86_64-w64-mingw32ucrt-pkg-config' ranlib = '/usr/bin/x86_64-w64-mingw32ucrt-ranlib' strip = '/usr/bin/x86_64-w64-mingw32ucrt-strip' windres = '/usr/bin/x86_64-w64-mingw32ucrt-windres' From a19c9b95f646dd6e081c8f9f8a737d8364cbd8ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 17:46:59 +0000 Subject: [PATCH 09/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- mingw-filesystem.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index 37c4eb1..2b886ea 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -10,7 +10,7 @@ Name: mingw-filesystem Version: 148 -Release: 7%{?dist} +Release: 8%{?dist} Summary: MinGW cross compiler base filesystem and environment License: GPL-2.0-or-later @@ -378,6 +378,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 148-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Sep 07 2024 Zephyr Lykos - 148-7 - Fix meson deprecation warnings From 04c3b516570dc899fa5368fd2db9a6075340b16d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 5 Apr 2025 02:01:25 +0200 Subject: [PATCH 10/13] Only add cross host tools bin dir to PATH --- macros.mingw32 | 4 ++-- macros.mingw64 | 4 ++-- mingw-filesystem.spec | 7 +++++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/macros.mingw32 b/macros.mingw32 index 0b2a751..3fe7245 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -55,7 +55,7 @@ if test -z "$PATH_ORIG" ; then \ PATH_ORIG="$PATH"; export PATH_ORIG; \ fi; \ - PATH="%{mingw32_bindir}:$PATH_ORIG"; export PATH; \ + PATH="%{_prefix}/%{mingw32_target}/bin:$PATH_ORIG"; export PATH; \ HOST_CC=gcc; export HOST_CC; \ unset PKG_CONFIG_PATH; \ _PREFIX="%{_bindir}/%{mingw32_target}-"; \ @@ -79,7 +79,7 @@ FCFLAGS="${MINGW32_FCFLAGS-%mingw32_fflags}"; export FCFLAGS; \ LDFLAGS="${MINGW32_LDFLAGS:-%mingw32_ldflags}"; export LDFLAGS; \ RUSTFLAGS="${MINGW32_RUSTFLAGS:-%mingw32_rustflags}"; export RUSTFLAGS; \ - for i in `ls %{mingw32_bindir}/*|grep -- "-config\$"` ; do \ + for i in `ls %{_prefix}/%{mingw32_target}/bin/*|grep -- "-config\$"` ; do \ x=`basename $i|tr "a-z+-." "A-ZX_"`; \ declare -x $x="$i" ; export $x; \ done; \ diff --git a/macros.mingw64 b/macros.mingw64 index 4b96dc3..ddaa150 100644 --- a/macros.mingw64 +++ b/macros.mingw64 @@ -55,7 +55,7 @@ if test -z "$PATH_ORIG" ; then \ PATH_ORIG="$PATH"; export PATH_ORIG; \ fi; \ - PATH="%{mingw64_bindir}:$PATH_ORIG"; export PATH; \ + PATH="%{_prefix}/%{mingw64_target}/bin:$PATH_ORIG"; export PATH; \ HOST_CC=gcc; export HOST_CC; \ unset PKG_CONFIG_PATH; \ _PREFIX="%{_bindir}/%{mingw64_target}-"; \ @@ -79,7 +79,7 @@ FCFLAGS="${MINGW64_FCFLAGS-%mingw64_fflags}"; export FCFLAGS; \ LDFLAGS="${MINGW64_LDFLAGS:-%mingw64_ldflags}"; export LDFLAGS; \ RUSTFLAGS="${MINGW64_RUSTFLAGS:-%mingw64_rustflags}"; export RUSTFLAGS; \ - for i in `ls %{mingw64_bindir}/*|grep -- "-config\$"` ; do \ + for i in `ls %{_prefix}/%{mingw64_target}/bin/*|grep -- "-config\$"` ; do \ x=`basename $i|tr "a-z+-." "A-ZX_"`; \ declare -x $x="$i" ; export $x; \ done; \ diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index 2b886ea..56c8bf4 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -9,8 +9,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: mingw-filesystem -Version: 148 -Release: 8%{?dist} +Version: 149 +Release: 1%{?dist} Summary: MinGW cross compiler base filesystem and environment License: GPL-2.0-or-later @@ -378,6 +378,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt %changelog +* Sun Mar 23 2025 Sandro Mani - 149-1 +- Only add cross host tools bin dir to PATH + * Fri Jan 17 2025 Fedora Release Engineering - 148-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 220a8dc22f665b633547d1d302f52dcc85862375 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 29 May 2025 16:13:50 +0200 Subject: [PATCH 11/13] Re-add target bin dir to PATH Fixes mingw-gcc FTBFS --- macros.mingw32 | 4 ++-- macros.mingw64 | 4 ++-- mingw-filesystem.spec | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/macros.mingw32 b/macros.mingw32 index 3fe7245..0b2a751 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -55,7 +55,7 @@ if test -z "$PATH_ORIG" ; then \ PATH_ORIG="$PATH"; export PATH_ORIG; \ fi; \ - PATH="%{_prefix}/%{mingw32_target}/bin:$PATH_ORIG"; export PATH; \ + PATH="%{mingw32_bindir}:$PATH_ORIG"; export PATH; \ HOST_CC=gcc; export HOST_CC; \ unset PKG_CONFIG_PATH; \ _PREFIX="%{_bindir}/%{mingw32_target}-"; \ @@ -79,7 +79,7 @@ FCFLAGS="${MINGW32_FCFLAGS-%mingw32_fflags}"; export FCFLAGS; \ LDFLAGS="${MINGW32_LDFLAGS:-%mingw32_ldflags}"; export LDFLAGS; \ RUSTFLAGS="${MINGW32_RUSTFLAGS:-%mingw32_rustflags}"; export RUSTFLAGS; \ - for i in `ls %{_prefix}/%{mingw32_target}/bin/*|grep -- "-config\$"` ; do \ + for i in `ls %{mingw32_bindir}/*|grep -- "-config\$"` ; do \ x=`basename $i|tr "a-z+-." "A-ZX_"`; \ declare -x $x="$i" ; export $x; \ done; \ diff --git a/macros.mingw64 b/macros.mingw64 index ddaa150..4b96dc3 100644 --- a/macros.mingw64 +++ b/macros.mingw64 @@ -55,7 +55,7 @@ if test -z "$PATH_ORIG" ; then \ PATH_ORIG="$PATH"; export PATH_ORIG; \ fi; \ - PATH="%{_prefix}/%{mingw64_target}/bin:$PATH_ORIG"; export PATH; \ + PATH="%{mingw64_bindir}:$PATH_ORIG"; export PATH; \ HOST_CC=gcc; export HOST_CC; \ unset PKG_CONFIG_PATH; \ _PREFIX="%{_bindir}/%{mingw64_target}-"; \ @@ -79,7 +79,7 @@ FCFLAGS="${MINGW64_FCFLAGS-%mingw64_fflags}"; export FCFLAGS; \ LDFLAGS="${MINGW64_LDFLAGS:-%mingw64_ldflags}"; export LDFLAGS; \ RUSTFLAGS="${MINGW64_RUSTFLAGS:-%mingw64_rustflags}"; export RUSTFLAGS; \ - for i in `ls %{_prefix}/%{mingw64_target}/bin/*|grep -- "-config\$"` ; do \ + for i in `ls %{mingw64_bindir}/*|grep -- "-config\$"` ; do \ x=`basename $i|tr "a-z+-." "A-ZX_"`; \ declare -x $x="$i" ; export $x; \ done; \ diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index 56c8bf4..3a2c152 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -9,7 +9,7 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: mingw-filesystem -Version: 149 +Version: 150 Release: 1%{?dist} Summary: MinGW cross compiler base filesystem and environment @@ -378,6 +378,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt %changelog +* Thu May 29 2025 Sandro Mani - 150-1 +- Re-add target bin dir to PATH + * Sun Mar 23 2025 Sandro Mani - 149-1 - Only add cross host tools bin dir to PATH From fdcc6fd9c631fe2e118da02822e3aad77e63c8a5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 21:42:16 +0000 Subject: [PATCH 12/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- mingw-filesystem.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index 3a2c152..2e1e61b 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -10,7 +10,7 @@ Name: mingw-filesystem Version: 150 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW cross compiler base filesystem and environment License: GPL-2.0-or-later @@ -378,6 +378,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 150-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu May 29 2025 Sandro Mani - 150-1 - Re-add target bin dir to PATH From 66831ea950a9fa4b065a4bac8822b2d65496061d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 20 Aug 2025 15:56:43 +0400 Subject: [PATCH 13/13] Own a few more directories MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marc-André Lureau --- mingw-filesystem.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index 2e1e61b..4a0a807 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -10,7 +10,7 @@ Name: mingw-filesystem Version: 150 -Release: 2%{?dist} +Release: 3%{?dist} Summary: MinGW cross compiler base filesystem and environment License: GPL-2.0-or-later @@ -205,6 +205,8 @@ for target in i686-w64-mingw32 x86_64-w64-mingw32 x86_64-w64-mingw32ucrt; do mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/lib mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/lib/pkgconfig mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/lib/cmake + mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/libexec + mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/libexec/installed-tests mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/sbin # We don't normally package manual pages and info files, except @@ -223,6 +225,7 @@ for target in i686-w64-mingw32 x86_64-w64-mingw32 x86_64-w64-mingw32ucrt; do mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/xml mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/icons mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/metainfo + mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/installed-tests mkdir -p %{buildroot}%{_prefix}/lib/debug/%{_prefix}/$target done @@ -378,6 +381,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt %changelog +* Wed Aug 20 2025 Marc-André Lureau - 150-3 +- Own a few more directories. + * Thu Jul 24 2025 Fedora Release Engineering - 150-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild