Synchronize with Fedora Rawhide (For RHEL 10.0)

last_sync: bc82ce5793d3c16b32e21057df29e9df26f41abd
resolves: RHEL-73820
side-tag: c10s-build-side-3716-stack-gate
This commit is contained in:
Miroslav Rezanina 2025-01-14 09:40:25 +01:00
parent 619a4cf452
commit aad181ba06
8 changed files with 17 additions and 10 deletions

View File

@ -17,6 +17,7 @@
%mingw_debug_install_post %{mingw_finddebuginfo} %{_builddir}/%{?buildsubdir} %{mingw_build_targets} %mingw_debug_install_post %{mingw_finddebuginfo} %{_builddir}/%{?buildsubdir} %{mingw_build_targets}
%mingw_debug_package \ %mingw_debug_package \
%global __debug_package 1 \
%if 0%{?mingw_build_win32} == 1 \ %if 0%{?mingw_build_win32} == 1 \
%{?mingw32_debug_package} \ %{?mingw32_debug_package} \
%endif \ %endif \

View File

@ -162,7 +162,7 @@
if test -f meson.build; then __mingw32_topdir=.; \\\ if test -f meson.build; then __mingw32_topdir=.; \\\
elif test -f ../meson.build; then __mingw32_topdir=..; \\\ elif test -f ../meson.build; then __mingw32_topdir=..; \\\
else __mingw32_topdir=""; fi; \\\ else __mingw32_topdir=""; fi; \\\
%__meson \\\ %__meson setup \\\
--cross-file /usr/share/mingw/toolchain-mingw32.meson \\\ --cross-file /usr/share/mingw/toolchain-mingw32.meson \\\
--default-library shared \\\ --default-library shared \\\
--prefix %{mingw32_prefix} \\\ --prefix %{mingw32_prefix} \\\

View File

@ -162,7 +162,7 @@
if test -f meson.build; then __mingw64_topdir=.; \\\ if test -f meson.build; then __mingw64_topdir=.; \\\
elif test -f ../meson.build; then __mingw64_topdir=..; \\\ elif test -f ../meson.build; then __mingw64_topdir=..; \\\
else __mingw64_topdir=""; fi; \\\ else __mingw64_topdir=""; fi; \\\
%__meson \\\ %__meson setup \\\
--cross-file /usr/share/mingw/toolchain-mingw64.meson \\\ --cross-file /usr/share/mingw/toolchain-mingw64.meson \\\
--default-library shared \\\ --default-library shared \\\
--prefix %{mingw64_prefix} \\\ --prefix %{mingw64_prefix} \\\

View File

@ -158,7 +158,7 @@
if test -f meson.build; then __ucrt64_topdir=.; \\\ if test -f meson.build; then __ucrt64_topdir=.; \\\
elif test -f ../meson.build; then __ucrt64_topdir=..; \\\ elif test -f ../meson.build; then __ucrt64_topdir=..; \\\
else __ucrt64_topdir=""; fi; \\\ else __ucrt64_topdir=""; fi; \\\
%__meson \\\ %__meson setup \\\
--cross-file /usr/share/mingw/toolchain-ucrt64.meson \\\ --cross-file /usr/share/mingw/toolchain-ucrt64.meson \\\
--default-library shared \\\ --default-library shared \\\
--prefix %{ucrt64_prefix} \\\ --prefix %{ucrt64_prefix} \\\

View File

@ -10,7 +10,7 @@
Name: mingw-filesystem Name: mingw-filesystem
Version: 148 Version: 148
Release: 5%{?dist} Release: 7%{?dist}
Summary: MinGW cross compiler base filesystem and environment Summary: MinGW cross compiler base filesystem and environment
License: GPL-2.0-or-later 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 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
%changelog %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 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 148-5
- Bump release for October 2024 mass rebuild: - Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018 Resolves: RHEL-64018

View File

@ -2,9 +2,9 @@
c = 'i686-w64-mingw32-gcc' c = 'i686-w64-mingw32-gcc'
cpp = 'i686-w64-mingw32-g++' cpp = 'i686-w64-mingw32-g++'
fortran = 'i686-w64-mingw32-gfortran' 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' 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' ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib'
strip = '/usr/bin/i686-w64-mingw32-strip' strip = '/usr/bin/i686-w64-mingw32-strip'
windres = '/usr/bin/i686-w64-mingw32-windres' windres = '/usr/bin/i686-w64-mingw32-windres'

View File

@ -2,9 +2,9 @@
c = 'x86_64-w64-mingw32-gcc' c = 'x86_64-w64-mingw32-gcc'
cpp = 'x86_64-w64-mingw32-g++' cpp = 'x86_64-w64-mingw32-g++'
fortran = 'x86_64-w64-mingw32-gfortran' 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' 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' ranlib = '/usr/bin/x86_64-w64-mingw32-ranlib'
strip = '/usr/bin/x86_64-w64-mingw32-strip' strip = '/usr/bin/x86_64-w64-mingw32-strip'
windres = '/usr/bin/x86_64-w64-mingw32-windres' windres = '/usr/bin/x86_64-w64-mingw32-windres'

View File

@ -2,9 +2,11 @@
c = 'x86_64-w64-mingw32ucrt-gcc' c = 'x86_64-w64-mingw32ucrt-gcc'
cpp = 'x86_64-w64-mingw32ucrt-g++' cpp = 'x86_64-w64-mingw32ucrt-g++'
fortran = 'x86_64-w64-mingw32ucrt-gfortran' 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' 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' ranlib = '/usr/bin/x86_64-w64-mingw32ucrt-ranlib'
strip = '/usr/bin/x86_64-w64-mingw32ucrt-strip' strip = '/usr/bin/x86_64-w64-mingw32ucrt-strip'
windres = '/usr/bin/x86_64-w64-mingw32ucrt-windres' windres = '/usr/bin/x86_64-w64-mingw32ucrt-windres'