Fix building with gcc-10.

This commit is contained in:
Nick Clifton 2019-09-24 10:01:17 +01:00
parent 6a63423c37
commit 60374778c3
2 changed files with 19 additions and 1 deletions

View File

@ -0,0 +1,10 @@
--- binutils.orig/gold/descriptors.cc 2019-09-24 09:43:51.200071784 +0100
+++ binutils-2.32/gold/descriptors.cc 2019-09-24 09:44:24.028874593 +0100
@@ -26,6 +26,7 @@
#include <cstdio>
#include <cstring>
#include <fcntl.h>
+#include <string>
#include <unistd.h>
#include "debug.h"

View File

@ -2,7 +2,7 @@
Summary: A GNU collection of binary utilities Summary: A GNU collection of binary utilities
Name: %{?cross}binutils%{?_with_debug:-debug} Name: %{?cross}binutils%{?_with_debug:-debug}
Version: 2.32 Version: 2.32
Release: 24%{?dist} Release: 25%{?dist}
License: GPLv3+ License: GPLv3+
URL: https://sourceware.org/binutils URL: https://sourceware.org/binutils
@ -256,6 +256,10 @@ Patch28: binutils-CVE-2019-14250.patch
# Lifetime: Fixed in 2.33 # Lifetime: Fixed in 2.33
Patch29: binutils-CVE-2019-14444.patch Patch29: binutils-CVE-2019-14444.patch
# Purpose: Fix for building with gcc-10.
# Lifetime: Fixed in 2.34
Patch30: binutils-gcc-10-fixes.patch
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
Provides: bundled(libiberty) Provides: bundled(libiberty)
@ -411,6 +415,7 @@ Conflicts: gcc-c++ < 4.0.0
%patch27 -p1 %patch27 -p1
%patch28 -p1 %patch28 -p1
%patch29 -p1 %patch29 -p1
%patch30 -p1
# We cannot run autotools as there is an exact requirement of autoconf-2.59. # We cannot run autotools as there is an exact requirement of autoconf-2.59.
# FIXME - this is no longer true. Maybe try reinstating autotool use ? # FIXME - this is no longer true. Maybe try reinstating autotool use ?
@ -807,6 +812,9 @@ exit 0
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
%changelog %changelog
* Tue Sep 24 2019 Nick Clifton <nickc@redhat.com> - 2.32-25
- Fix building with gcc-10.
* Tue Aug 13 2019 Nick Clifton <nickc@redhat.com> - 2.32-24 * Tue Aug 13 2019 Nick Clifton <nickc@redhat.com> - 2.32-24
- Fix potential integer overflow in readelf. (#1740470) - Fix potential integer overflow in readelf. (#1740470)