import mingw-filesystem-148-7.el10

SOURCES/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                             \

SOURCES/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} \\\

SOURCES/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} \\\

SOURCES/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} \\\

SOURCES/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-msvc', '-C', 'linker=/usr/bin/i686-w64-mingw32-gcc']
+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'

SOURCES/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-msvc', '-C', 'linker=/usr/bin/x86_64-w64-mingw32-gcc']
+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'

SOURCES/toolchain-ucrt64.meson

@@ -2,9 +2,11 @@
 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-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'

SPECS/mingw-filesystem.spec

@@ -10,7 +10,7 @@
 
 Name:           mingw-filesystem
 Version:        148
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 License:        GPL-2.0-or-later
@@ -378,6 +378,10 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Tue Jan 14 2025 Miroslav Rezanina <mrezanin@redhat.com> - 148-7
+- Synchronize with Fedora Rawhide
+  Resolves: RHEL-73820
+
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 148-5
 - Bump release for October 2024 mass rebuild:
   Resolves: RHEL-64018