diff --git a/macros.mingw b/macros.mingw index d82abb3..6118c46 100644 --- a/macros.mingw +++ b/macros.mingw @@ -17,7 +17,6 @@ %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/macros.mingw32 b/macros.mingw32 index 0b2a751..250675c 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 setup \\\ + %__meson \\\ --cross-file /usr/share/mingw/toolchain-mingw32.meson \\\ --default-library shared \\\ --prefix %{mingw32_prefix} \\\ diff --git a/macros.mingw64 b/macros.mingw64 index 4b96dc3..493024d 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 setup \\\ + %__meson \\\ --cross-file /usr/share/mingw/toolchain-mingw64.meson \\\ --default-library shared \\\ --prefix %{mingw64_prefix} \\\ diff --git a/macros.ucrt64 b/macros.ucrt64 index 9c0057a..28e13dc 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 setup \\\ + %__meson \\\ --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 4a0a807..f13a80e 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: 150 +Version: 148 Release: 3%{?dist} Summary: MinGW cross compiler base filesystem and environment @@ -205,8 +205,6 @@ 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 @@ -225,7 +223,6 @@ 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 @@ -381,33 +378,6 @@ 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 - -* 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 - -* 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 - -* 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 - -* 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 diff --git a/toolchain-mingw32.meson b/toolchain-mingw32.meson index 600a297..563565c 100644 --- a/toolchain-mingw32.meson +++ b/toolchain-mingw32.meson @@ -2,9 +2,9 @@ c = 'i686-w64-mingw32-gcc' cpp = 'i686-w64-mingw32-g++' fortran = 'i686-w64-mingw32-gfortran' -rust = ['rustc', '--target', 'i686-pc-windows-gnu'] +rust = ['rustc', '--target', 'i686-pc-windows-msvc', '-C', 'linker=/usr/bin/i686-w64-mingw32-gcc'] ar = '/usr/bin/i686-w64-mingw32-ar' -pkg-config = '/usr/bin/i686-w64-mingw32-pkg-config' +pkgconfig = '/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 91298ec..01d83ee 100644 --- a/toolchain-mingw64.meson +++ b/toolchain-mingw64.meson @@ -2,9 +2,9 @@ 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-gnu'] +rust = ['rustc', '--target', 'x86_64-pc-windows-msvc', '-C', 'linker=/usr/bin/x86_64-w64-mingw32-gcc'] ar = '/usr/bin/x86_64-w64-mingw32-ar' -pkg-config = '/usr/bin/x86_64-w64-mingw32-pkg-config' +pkgconfig = '/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 0834d2a..8eb172b 100644 --- a/toolchain-ucrt64.meson +++ b/toolchain-ucrt64.meson @@ -2,11 +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-gnu'] -# XXX: there is no mingw/rustc target for UCRT yet, but this should do -rust_ld = 'x86_64-w64-mingw32ucrt-gcc' +rust = ['rustc', '--target', 'x86_64-pc-windows-msvc', '-C', 'linker=/usr/bin/x86_64-w64-mingw32ucrt-gcc'] ar = '/usr/bin/x86_64-w64-mingw32ucrt-ar' -pkg-config = '/usr/bin/x86_64-w64-mingw32ucrt-pkg-config' +pkgconfig = '/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'