| 1 |
commit: 1a173bc429e51de4fcf6ceada45cd7274ab12aaf |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 24 19:17:09 2017 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 24 19:17:19 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a173bc4 |
| 7 |
|
| 8 |
dev-util/ltrace: fix build failure on ia64 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 11 |
|
| 12 |
dev-util/ltrace/files/ltrace-0.7.3-ia64.patch | 39 +++++++++++++++++++++++++++ |
| 13 |
dev-util/ltrace/ltrace-0.7.3_p4.ebuild | 3 ++- |
| 14 |
2 files changed, 41 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-ia64.patch b/dev-util/ltrace/files/ltrace-0.7.3-ia64.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..4fb1c4eba73 |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-util/ltrace/files/ltrace-0.7.3-ia64.patch |
| 21 |
@@ -0,0 +1,39 @@ |
| 22 |
+Fix build fauilure on ia64. |
| 23 |
+ |
| 24 |
+Build fails due to bitrot: some definitions |
| 25 |
+moved off from <sys/pthrace.h> to <asm/ptrace.h> |
| 26 |
+(similar to other arches). |
| 27 |
+ |
| 28 |
+fetch.c:39:26: error: field 'regs' has incomplete type |
| 29 |
+ struct pt_all_user_regs regs; |
| 30 |
+ ^~~~ |
| 31 |
+fetch.c:209:25: warning: 'struct ia64_fpreg' declared inside parameter list will not be visible outside of this definition or declaration |
| 32 |
+ fpreg_to_double (struct ia64_fpreg *fp) { |
| 33 |
+ ^~~~~~~~~~ |
| 34 |
+fetch.c: In function 'fpreg_to_double': |
| 35 |
+fetch.c:211:45: error: dereferencing pointer to incomplete type 'struct ia64_fpreg' |
| 36 |
+ asm ("ldf.fill %0=%1" : "=f"(result) : "m"(*fp)); |
| 37 |
+ ^~~ |
| 38 |
+ |
| 39 |
+diff --git a/sysdeps/linux-gnu/ia64/fetch.c b/sysdeps/linux-gnu/ia64/fetch.c |
| 40 |
+index 54dc5b8..b3b9a9a 100644 |
| 41 |
+--- a/sysdeps/linux-gnu/ia64/fetch.c |
| 42 |
++++ b/sysdeps/linux-gnu/ia64/fetch.c |
| 43 |
+@@ -134,9 +134,4 @@ allocate_reg(struct fetch_context *ctx, struct Process *proc, |
| 44 |
+ return 0; |
| 45 |
+ |
| 46 |
+- /* This would normally be brought over from asm/ptrace.h, but |
| 47 |
+- * when we do, we get namespace conflicts between asm/fpu.h |
| 48 |
+- * and libunwind. */ |
| 49 |
+- enum { PT_AUR_BSP = 17 }; |
| 50 |
+- |
| 51 |
+ union cfm_t cfm = { .value = ctx->regs.cfm }; |
| 52 |
+ unsigned long *bsp = (unsigned long *)ctx->regs.ar[PT_AUR_BSP]; |
| 53 |
+diff --git a/sysdeps/linux-gnu/ia64/ptrace.h b/sysdeps/linux-gnu/ia64/ptrace.h |
| 54 |
+index ef63b4f..8b131f1 100644 |
| 55 |
+--- a/sysdeps/linux-gnu/ia64/ptrace.h |
| 56 |
++++ b/sysdeps/linux-gnu/ia64/ptrace.h |
| 57 |
+@@ -20,2 +20,3 @@ |
| 58 |
+ |
| 59 |
+ #include <sys/ptrace.h> |
| 60 |
++#include <asm/ptrace.h> |
| 61 |
|
| 62 |
diff --git a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild |
| 63 |
index 7305b4cba13..a818ab97085 100644 |
| 64 |
--- a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild |
| 65 |
+++ b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild |
| 66 |
@@ -1,4 +1,4 @@ |
| 67 |
-# Copyright 1999-2016 Gentoo Foundation |
| 68 |
+# Copyright 1999-2017 Gentoo Foundation |
| 69 |
# Distributed under the terms of the GNU General Public License v2 |
| 70 |
|
| 71 |
EAPI=5 |
| 72 |
@@ -32,6 +32,7 @@ src_prepare() { |
| 73 |
epatch "${WORKDIR}"/debian/patches/[0-9]* |
| 74 |
epatch "${FILESDIR}"/${PN}-0.7.3-test-protos.patch #bug 421649 |
| 75 |
epatch "${FILESDIR}"/${PN}-0.7.3-alpha-protos.patch |
| 76 |
+ epatch "${FILESDIR}"/${PN}-0.7.3-ia64.patch |
| 77 |
sed -i '/^dist_doc_DATA/d' Makefile.am || die |
| 78 |
eautoreconf |
| 79 |
} |
Archives