Manually merge with fedora/rawhide

resolves: rhbz#1996700
This commit is contained in:
Richard W.M. Jones 2021-08-23 15:04:40 +01:00
parent 4951e3299f
commit c4c3152d63
5 changed files with 75 additions and 3 deletions

2
.gitignore vendored
View File

@ -64,3 +64,5 @@
/mingw-w64-v6.0.0.tar.bz2
/mingw-w64-v7.0.0.tar.bz2
/mingw-w64-v8.0.0.tar.bz2
/mingw-w64-v8.0.2.tar.bz2
/mingw-w64-v9.0.0.tar.bz2

View File

@ -8,8 +8,8 @@
#%%global pre rc2
Name: mingw-crt
Version: 8.0.0
Release: 4%{?dist}
Version: 9.0.0
Release: 2%{?dist}
Summary: MinGW Windows cross-compiler runtime
License: Public Domain and ZPLv2.1
@ -24,6 +24,8 @@ Source0: http://sourceforge.net/code-snapshots/git/m/mi/mingw-w64/mingw-w
%else
Source0: http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}%{?pre:-%{pre}}.tar.bz2
%endif
# Fix build failure with gcc11
Patch0: mingw-crt_gcc11.patch
BuildArch: noarch
@ -106,6 +108,11 @@ rm -rf %{buildroot}%{mingw64_includedir}/*.c
%changelog
* Mon Aug 23 2021 Richard W.M. Jones <rjones@redhat.com> - 9.0.0-2
- Update to 9.0.0
- Manually merge with fedora/rawhide
resolves: rhbz#1996700
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 8.0.0-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688

12
mingw-crt_gcc11.patch Normal file
View File

@ -0,0 +1,12 @@
diff -rupN --no-dereference mingw-w64-v9.0.0/mingw-w64-crt/intrincs/rdtsc.c mingw-w64-v9.0.0-new/mingw-w64-crt/intrincs/rdtsc.c
--- mingw-w64-v9.0.0/mingw-w64-crt/intrincs/rdtsc.c 2021-05-22 14:34:25.000000000 +0200
+++ mingw-w64-v9.0.0-new/mingw-w64-crt/intrincs/rdtsc.c 2021-06-22 11:40:49.403979807 +0200
@@ -15,7 +15,7 @@
#endif
#if !__has_builtin(__rdtsc)
-unsigned __int64 __rdtsc(void)
+unsigned __int64 __rdtsc()
{
#ifdef _WIN64
unsigned __int64 val1, val2;

View File

@ -1 +1 @@
SHA512 (mingw-w64-v8.0.0.tar.bz2) = cefcc86ac3e6337c88ed224ab4692abbd5eb543ce78fb6c5462198a85f36c9274a0a1df0a0bebd182137fd527c15831f9237c782711a85f32e77d9104b28359e
SHA512 (mingw-w64-v9.0.0.tar.bz2) = 6691331a2ab521d22c1d32bebe0ed049bd62a7a7722cff38e7792b4e42c6b8df4356084afff6c916b487b3ebddc4372b398ab7cd0c7f4ff6991a70fe64177386

51
wincore-def.patch Normal file
View File

@ -0,0 +1,51 @@
diff -rupN --no-dereference mingw-w64-v8.0.2/mingw-w64-crt/lib32/api-ms-win-core-path-l1-1-0.def mingw-w64-v8.0.2-new/mingw-w64-crt/lib32/api-ms-win-core-path-l1-1-0.def
--- mingw-w64-v8.0.2/mingw-w64-crt/lib32/api-ms-win-core-path-l1-1-0.def 2021-05-09 08:38:05.000000000 +0200
+++ mingw-w64-v8.0.2-new/mingw-w64-crt/lib32/api-ms-win-core-path-l1-1-0.def 2021-05-31 15:52:45.098567797 +0200
@@ -2,25 +2,25 @@ LIBRARY api-ms-win-core-path-l1-1-0
EXPORTS
-PathAllocCanonicalize@
-PathAllocCombine@
-PathCchAddBackslash@
-PathCchAddBackslashEx@
-PathCchAddExtension@
-PathCchAppend@
-PathCchAppendEx@
-PathCchCanonicalize@
-PathCchCanonicalizeEx@
-PathCchCombine@
-PathCchCombineEx@
-PathCchFindExtension@
-PathCchIsRoot@
-PathCchRemoveBackslash@
-PathCchRemoveBackslashEx@
-PathCchRemoveExtension@
-PathCchRemoveFileSpec@
-PathCchRenameExtension@
-PathCchSkipRoot@
-PathCchStripPrefix@
-PathCchStripToRoot@
-PathIsUNCEx@
+PathAllocCanonicalize@12
+PathAllocCombine@16
+PathCchAddBackslash@8
+PathCchAddBackslashEx@16
+PathCchAddExtension@12
+PathCchAppend@12
+PathCchAppendEx@16
+PathCchCanonicalize@12
+PathCchCanonicalizeEx@16
+PathCchCombine@16
+PathCchCombineEx@20
+PathCchFindExtension@12
+PathCchIsRoot@4
+PathCchRemoveBackslash@8
+PathCchRemoveBackslashEx@16
+PathCchRemoveExtension@8
+PathCchRemoveFileSpec@8
+PathCchRenameExtension@12
+PathCchSkipRoot@8
+PathCchStripPrefix@8
+PathCchStripToRoot@8
+PathIsUNCEx@8