Compare commits

...

No commits in common. "imports/c9-beta/mingw-crt-9.0.0-2.el9" and "c8s" have entirely different histories.

4 changed files with 9 additions and 83 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/mingw-w64-v9.0.0.tar.bz2
SOURCES/mingw-w64-v5.0.2.tar.bz2

View File

@ -1 +1 @@
9c496ed063e085888d250cc461ec4d31d97b72f1 SOURCES/mingw-w64-v9.0.0.tar.bz2
bb5409f034abb7c021b3e1c14db433fd253cbb59 SOURCES/mingw-w64-v5.0.2.tar.bz2

View File

@ -1,12 +0,0 @@
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

@ -8,7 +8,7 @@
#%%global pre rc2
Name: mingw-crt
Version: 9.0.0
Version: 5.0.2
Release: 2%{?dist}
Summary: MinGW Windows cross-compiler runtime
@ -24,13 +24,9 @@ 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
BuildRequires: make
BuildRequires: mingw32-filesystem >= 95
BuildRequires: mingw32-binutils
BuildRequires: mingw32-headers
@ -71,31 +67,28 @@ rm -rf mingw-w64-v%{version}
mkdir mingw-w64-v%{version}
cd mingw-w64-v%{version}
unzip %{S:0}
%autosetup -p1 -D -T -n mingw-w64-v%{version}/mingw-w64-mingw-w64-%{snapshot_rev}
%setup -q -D -T -n mingw-w64-v%{version}/mingw-w64-mingw-w64-%{snapshot_rev}
%else
%autosetup -p1 -n mingw-w64-v%{version}%{?pre:-%{pre}}
%setup -q -n mingw-w64-v%{version}%{?pre:-%{pre}}
%endif
%build
pushd mingw-w64-crt
# Filter out -fstack-protector and -lssp from LDFLAGS as libssp is not yet potentially built with the bootstrap gcc
MINGW32_LDFLAGS="`echo %{mingw32_ldflags} | sed 's|-fstack-protector||' | sed 's|-lssp||'`"
MINGW64_LDFLAGS="`echo %{mingw64_ldflags} | sed 's|-fstack-protector||' | sed 's|-lssp||'`"
MINGW64_CONFIGURE_ARGS="--disable-lib32"
%mingw_configure
%mingw_make_build
%mingw_make %{?_smp_mflags}
popd
%install
pushd mingw-w64-crt
%mingw_make_install
%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
popd
# Dunno what to do with these files
rm -rf %{buildroot}%{mingw32_includedir}/*.c
rm -rf %{buildroot}%{mingw64_includedir}/*.c
rm -rf $RPM_BUILD_ROOT%{mingw32_includedir}/*.c
rm -rf $RPM_BUILD_ROOT%{mingw64_includedir}/*.c
%files -n mingw32-crt
@ -108,61 +101,6 @@ 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
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 8.0.0-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sat Jan 16 2021 Sandro Mani <manisandro@gmail.com> - 8.0.0-1
- Update to 8.0.0
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sat Jun 20 2020 Sandro Mani <manisandro@gmail.com> - 7.0.0-1
- Update to 7.0.0
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Oct 08 2019 Sandro Mani <manisandro@gmail.com> - 6.0.0-3
- Rebuild (Changes/Mingw32GccDwarf2)
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue May 07 2019 Sandro Mani <manisandro@gmail.com> - 6.0.0-1
- Update to 6.0.0
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Jul 09 2018 Kalev Lember <klember@redhat.com> - 5.0.4-1
- Update to 5.0.4
* Thu Jun 14 2018 Sandro Mani <manisandro@gmail.com> - 5.0.3-2
- Rebuild (mingw-headers)
* Wed May 30 2018 Sandro Mani <manisandro@gmail.com> - 5.0.3-1
- Update to 5.0.3
- Backport patch for incomplete dwmapi.a
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild