This patch (attached, slightly different from the one I sent to you
earlier) builds a package for me using 'fedpkg local'.
What do you think?
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-p2v converts physical machines to virtual machines. Boot with a
live CD or over the network (PXE) and turn machines into KVM guests.
http://libguestfs.org/virt-v2v
>From a9856ef0042a26adcc832391376f123a679c1dad Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@xxxxxxxxxx>
Date: Thu, 29 Apr 2021 13:56:41 +0100
Subject: [PATCH] Update to 11.1.1
---
.gitignore | 1 +
mingw-gcc-config.patch | 24 ++++++++++++------------
mingw-gcc.spec | 21 +++++++++++----------
sources | 2 +-
4 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/.gitignore b/.gitignore
index 047789b..e8e7dc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@ gcc-4.5.1.tar.bz2
/gcc-10.1.1-20200618.tar.xz
/gcc-10.2.1-20200723.tar.xz
/gcc-10.3.1-20210422.tar.xz
+/gcc-11.1.1-20210428.tar.xz
diff --git a/mingw-gcc-config.patch b/mingw-gcc-config.patch
index 1484357..bfad352 100644
--- a/mingw-gcc-config.patch
+++ b/mingw-gcc-config.patch
@@ -1,7 +1,7 @@
-diff -rupN --no-dereference gcc-10.3.1-20210422/config/intdiv0.m4 gcc-10.3.1-20210422-new/config/intdiv0.m4
---- gcc-10.3.1-20210422/config/intdiv0.m4 2021-04-22 19:22:55.000000000 +0200
-+++ gcc-10.3.1-20210422-new/config/intdiv0.m4 2021-04-26 18:35:17.451105239 +0200
-@@ -31,10 +31,10 @@ sigfpe_handler (sig) int sig;
+diff -ur gcc-11.1.1-20210428.old/config/intdiv0.m4 gcc-11.1.1-20210428.new/config/intdiv0.m4
+--- gcc-11.1.1-20210428.old/config/intdiv0.m4 2021-04-28 12:34:08.000000000 +0100
++++ gcc-11.1.1-20210428.new/config/intdiv0.m4 2021-04-29 14:01:47.129662449 +0100
+@@ -31,10 +31,10 @@
exit (sig != SIGFPE);
}
@@ -16,10 +16,10 @@ diff -rupN --no-dereference gcc-10.3.1-20210422/config/intdiv0.m4 gcc-10.3.1-202
int main ()
{
-diff -rupN --no-dereference gcc-10.3.1-20210422/libiberty/aclocal.m4 gcc-10.3.1-20210422-new/libiberty/aclocal.m4
---- gcc-10.3.1-20210422/libiberty/aclocal.m4 2021-04-22 19:22:55.000000000 +0200
-+++ gcc-10.3.1-20210422-new/libiberty/aclocal.m4 2021-04-26 18:35:17.591105242 +0200
-@@ -149,7 +149,7 @@ if test $ac_cv_os_cray = yes; then
+diff -ur gcc-11.1.1-20210428.old/libiberty/acinclude.m4 gcc-11.1.1-20210428.new/libiberty/acinclude.m4
+--- gcc-11.1.1-20210428.old/libiberty/acinclude.m4 2021-04-28 12:34:08.000000000 +0100
++++ gcc-11.1.1-20210428.new/libiberty/acinclude.m4 2021-04-29 14:02:45.821440514 +0100
+@@ -157,7 +157,7 @@
fi
AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
@@ -28,10 +28,10 @@ diff -rupN --no-dereference gcc-10.3.1-20210422/libiberty/aclocal.m4 gcc-10.3.1-
{
static char *addr = 0;
auto char dummy;
-diff -rupN --no-dereference gcc-10.3.1-20210422/libiberty/configure.ac gcc-10.3.1-20210422-new/libiberty/configure.ac
---- gcc-10.3.1-20210422/libiberty/configure.ac 2021-04-22 19:22:55.000000000 +0200
-+++ gcc-10.3.1-20210422-new/libiberty/configure.ac 2021-04-26 18:35:17.591105242 +0200
-@@ -664,7 +664,7 @@ if test -z "${setobjs}"; then
+diff -ur gcc-11.1.1-20210428.old/libiberty/configure.ac gcc-11.1.1-20210428.new/libiberty/configure.ac
+--- gcc-11.1.1-20210428.old/libiberty/configure.ac 2021-04-28 12:34:08.000000000 +0100
++++ gcc-11.1.1-20210428.new/libiberty/configure.ac 2021-04-29 14:01:47.131662473 +0100
+@@ -665,7 +665,7 @@
for v in $vars; do
AC_MSG_CHECKING([for $v])
AC_CACHE_VAL(libiberty_cv_var_$v,
diff --git a/mingw-gcc.spec b/mingw-gcc.spec
index 853384a..04bf2d2 100644
--- a/mingw-gcc.spec
+++ b/mingw-gcc.spec
@@ -23,10 +23,10 @@
# Run the testsuite
%global enable_tests 0
-%global DATE 20210422
-%global GITREV dc5e381a715a658cfcc08ba3cbaa6bc53adc596f
-%global gcc_version 10.3.1
-%global gcc_major 10
+%global DATE 20210428
+%global GITREV eb4b27fdf644012c40fe49ba8440594770dd8289
+%global gcc_version 11.1.1
+%global gcc_major 11
Name: mingw-gcc
Version: %{gcc_version}
@@ -459,6 +459,7 @@ ln -sf %{mingw64_bindir}/libssp-0.dll %{buildroot}%{mingw64_libdir}/libssp.dll.a
%{_prefix}/lib/gcc/%{mingw32_target}/%{version}/include/*.h
%{_prefix}/lib/gcc/%{mingw32_target}/%{version}/install-tools/*
%{_libexecdir}/gcc/%{mingw32_target}/%{version}/collect2
+%{_libexecdir}/gcc/%{mingw32_target}/%{version}/g++-mapper-server
%{_libexecdir}/gcc/%{mingw32_target}/%{version}/lto-wrapper
%{_libexecdir}/gcc/%{mingw32_target}/%{version}/install-tools
%{_mandir}/man1/%{mingw32_target}-gcc.1*
@@ -488,9 +489,7 @@ ln -sf %{mingw64_bindir}/libssp-0.dll %{buildroot}%{mingw64_libdir}/libssp.dll.a
%dir %{_prefix}/lib/gcc/%{mingw32_target}/%{version}/include/ssp
%{_prefix}/lib/gcc/%{mingw32_target}/%{version}/include/ssp/*.h
%{_libexecdir}/gcc/%{mingw32_target}/%{version}/lto1
-%{_libexecdir}/gcc/%{mingw32_target}/%{version}/liblto_plugin.so
-%{_libexecdir}/gcc/%{mingw32_target}/%{version}/liblto_plugin.so.0
-%{_libexecdir}/gcc/%{mingw32_target}/%{version}/liblto_plugin.so.0.0.0
+%{_libexecdir}/gcc/%{mingw32_target}/%{version}/liblto_plugin.so*
%{_mandir}/man1/%{mingw32_target}-lto-dump.1*
%endif
@@ -512,6 +511,7 @@ ln -sf %{mingw64_bindir}/libssp-0.dll %{buildroot}%{mingw64_libdir}/libssp.dll.a
%{_prefix}/lib/gcc/%{mingw64_target}/%{version}/include/*.h
%{_prefix}/lib/gcc/%{mingw64_target}/%{version}/install-tools/*
%{_libexecdir}/gcc/%{mingw64_target}/%{version}/collect2
+%{_libexecdir}/gcc/%{mingw64_target}/%{version}/g++-mapper-server
%{_libexecdir}/gcc/%{mingw64_target}/%{version}/lto-wrapper
%{_libexecdir}/gcc/%{mingw64_target}/%{version}/install-tools
%{_mandir}/man1/%{mingw64_target}-gcc.1*
@@ -541,9 +541,7 @@ ln -sf %{mingw64_bindir}/libssp-0.dll %{buildroot}%{mingw64_libdir}/libssp.dll.a
%dir %{_prefix}/lib/gcc/%{mingw64_target}/%{version}/include/ssp
%{_prefix}/lib/gcc/%{mingw64_target}/%{version}/include/ssp/*.h
%{_libexecdir}/gcc/%{mingw64_target}/%{version}/lto1
-%{_libexecdir}/gcc/%{mingw64_target}/%{version}/liblto_plugin.so
-%{_libexecdir}/gcc/%{mingw64_target}/%{version}/liblto_plugin.so.0
-%{_libexecdir}/gcc/%{mingw64_target}/%{version}/liblto_plugin.so.0.0.0
+%{_libexecdir}/gcc/%{mingw64_target}/%{version}/liblto_plugin.so*
%{_mandir}/man1/%{mingw64_target}-lto-dump.1*
%endif
@@ -669,6 +667,9 @@ ln -sf %{mingw64_bindir}/libssp-0.dll %{buildroot}%{mingw64_libdir}/libssp.dll.a
%changelog
+* Thu Apr 29 2021 Richard W.M. Jones <rjones@xxxxxxxxxx> - 11.1.1-1
+- Update to 11.1.1
+
* Mon Apr 26 2021 Sandro Mani <manisandro@xxxxxxxxx> - 10.3.1-1
- Update to 10.3.1
diff --git a/sources b/sources
index 0e2ac8d..83cb65b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gcc-10.3.1-20210422.tar.xz) = e88b53be14b345d24cdd94d4b6fc52422c36400087594a47abbd062f6f8c681de6119a3cb93c142bea0c3b50a5c7bd43ff1e1cef661dd92390ecffdf98e4ea96
+SHA512 (gcc-11.1.1-20210428.tar.xz) = c9dbb4b65a36f39f3e2b98d5a1b2ae68a541cea775a10df6ab32fcbc369f9e17e196de8b9d85280f7a9c59f911e56490ba32bc72e71817e5cec9c54bf9eecfb5
--
2.29.2
_______________________________________________
devel mailing list -- devel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/devel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
