[gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils/files/, sys-devel/binutils/

["Sergei Trofimovich" <slyfox@gentoo.org>]

commit:     31ea5c5ef16889c000670d48d769294823fa1cd4
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  9 20:07:11 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Mar  9 20:07:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31ea5c5e

sys-devel/binutils: tweak 2.32 for gcc-10

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sys-devel/binutils/binutils-2.32-r2.ebuild          |  9 +++++++--
 sys-devel/binutils/files/binutils-2.32-gcc-10.patch | 16 ++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/sys-devel/binutils/binutils-2.32-r2.ebuild b/sys-devel/binutils/binutils-2.32-r2.ebuild
index 3e54336e168..0242f709569 100644
--- a/sys-devel/binutils/binutils-2.32-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.32-r2.ebuild
@@ -55,8 +55,13 @@ PATCH_DEV=${PATCH_DEV:-slyfox}
 [[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
 	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
 
-# Disable gold testsuite since it always fails.
-PATCHES=( "${FILESDIR}/${PN}-2.29.1-nogoldtest.patch" )
+PATCHES=(
+	# Disable gold testsuite since it always fails.
+	"${FILESDIR}/${PN}-2.29.1-nogoldtest.patch"
+
+	"${FILESDIR}"/${PN}-2.32-gcc-10.patch
+	"${FILESDIR}"/${PN}-2.33-gcc-10.patch
+)
 
 #
 # The cross-compile logic

diff --git a/sys-devel/binutils/files/binutils-2.32-gcc-10.patch b/sys-devel/binutils/files/binutils-2.32-gcc-10.patch
new file mode 100644
index 00000000000..fa7069456cd
--- /dev/null
+++ b/sys-devel/binutils/files/binutils-2.32-gcc-10.patch
@@ -0,0 +1,16 @@
+commit a3972330f49f81b3bea64af0970d22f42ae56ec3
+Author: Martin Liska <mliska@suse.cz>
+Date:   Fri Jun 7 07:36:52 2019 +0200
+
+    Fix a missing include of <string>
+    
+--- a/gold/errors.h
++++ b/gold/errors.h
+@@ -24,6 +24,7 @@
+ #define GOLD_ERRORS_H
+ 
+ #include <cstdarg>
++#include <string>
+ 
+ #include "gold-threads.h"
+