From 41edf489e33da72b164c817cf733f0b1325a794e Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Wed, 20 Jan 2021 02:36:58 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/mingw-crt.git#cc8db0138cd64596657f282e3590e8145db97843
---
 .gitignore     |  1 +
 mingw-crt.spec | 16 ++++++++++++----
 sources        |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index e2ebcce..854fbbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@
 /mingw-w64-v5.0.4.tar.bz2
 /mingw-w64-v6.0.0.tar.bz2
 /mingw-w64-v7.0.0.tar.bz2
+/mingw-w64-v8.0.0.tar.bz2
diff --git a/mingw-crt.spec b/mingw-crt.spec
index 89b8612..7fbd35f 100644
--- a/mingw-crt.spec
+++ b/mingw-crt.spec
@@ -8,8 +8,8 @@
 #%%global pre rc2
 
 Name:           mingw-crt
-Version:        7.0.0
-Release:        2%{?dist}
+Version:        8.0.0
+Release:        1%{?dist}
 Summary:        MinGW Windows cross-compiler runtime
 
 License:        Public Domain and ZPLv2.1
@@ -27,6 +27,8 @@ Source0:        http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}
 
 BuildArch:      noarch
 
+BuildRequires:  make
+
 BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-headers
@@ -75,15 +77,18 @@ unzip %{S:0}
 
 %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 %{?_smp_mflags}
+    %mingw_make_build
 popd
 
 
 %install
 pushd mingw-w64-crt
-    %mingw_make_install DESTDIR=%{buildroot}
+    %mingw_make_install
 popd
 
 # Dunno what to do with these files
@@ -101,6 +106,9 @@ rm -rf %{buildroot}%{mingw64_includedir}/*.c
 
 
 %changelog
+* 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
 
diff --git a/sources b/sources
index c5b67c8..f23dda6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mingw-w64-v7.0.0.tar.bz2) = 30e5b2824a24eeb99ab519e3fc134cc9a7f04ee8b853bc8d66a13d1ab74144bf78b93e162bfe6de2a5e61f63c0e620a933b260b02d019cd68cc4b78bd36c67fd
+SHA512 (mingw-w64-v8.0.0.tar.bz2) = cefcc86ac3e6337c88ed224ab4692abbd5eb543ce78fb6c5462198a85f36c9274a0a1df0a0bebd182137fd527c15831f9237c782711a85f32e77d9104b28359e