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

[Sergei Trofimovich]

commit:     c61c0eeba20f941011ed6d87c86664c77f9b4152
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 30 11:06:26 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jun 30 11:06:40 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c61c0eeb

sys-devel/gdb: fix build failure on ia64, bug #658014

It's a backport of upstream fix by Émeric Maschino
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8

Reported-by: Émeric Maschino
Fixed-by: Émeric Maschino
Closes: https://bugs.gentoo.org/658014
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 sys-devel/gdb/files/gdb-7.12.1-ia64-include.patch | 26 +++++++++++++++++++++++
 sys-devel/gdb/gdb-7.12.1.ebuild                   |  1 +
 2 files changed, 27 insertions(+)

diff --git a/sys-devel/gdb/files/gdb-7.12.1-ia64-include.patch b/sys-devel/gdb/files/gdb-7.12.1-ia64-include.patch
new file mode 100644
index 00000000000..3b910da4227
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-7.12.1-ia64-include.patch
@@ -0,0 +1,26 @@
+fixes build failure on ia64
+
+It's a backport of upstream fix by Émeric Maschino
+https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=5a6c3296a7a90694ad4042f6256f3da6d4fa4ee8
+https://bugs.gentoo.org/658014
+--- a/gdb/nat/linux-ptrace.c	2017-01-21 14:48:42.000000000 +0100
++++ b/gdb/nat/linux-ptrace.c	2018-06-20 00:03:40.520317323 +0200
+@@ -21,8 +21,6 @@
+ #include "linux-procfs.h"
+ #include "linux-waitpid.h"
+ #include "buffer.h"
+-#include "gdb_wait.h"
+-#include "gdb_ptrace.h"
+ #include <sys/procfs.h>
+ 
+ /* Stores the ptrace options supported by the running kernel.
+--- a/gdb/nat/linux-ptrace.h	2017-01-21 14:46:47.000000000 +0100
++++ b/gdb/nat/linux-ptrace.h	2018-06-20 00:04:28.706220951 +0200
+@@ -21,6 +21,7 @@
+ struct buffer;
+ 
+ #include "nat/gdb_ptrace.h"
++#include "gdb_wait.h"
+ 
+ #ifdef __UCLIBC__
+ #if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))

diff --git a/sys-devel/gdb/gdb-7.12.1.ebuild b/sys-devel/gdb/gdb-7.12.1.ebuild
index a1863b60ff0..48dde882bdd 100644
--- a/sys-devel/gdb/gdb-7.12.1.ebuild
+++ b/sys-devel/gdb/gdb-7.12.1.ebuild
@@ -92,6 +92,7 @@ pkg_setup() {
 src_prepare() {
 	[[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
 	! use vanilla && [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+	epatch "${FILESDIR}"/${P}-ia64-include.patch #655270
 	epatch_user
 	strip-linguas -u bfd/po opcodes/po
 }