From 88877b78c810dc9e17e64846c5a30109053c294a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 13 Sep 2013 19:54:29 +0200
Subject: fix musl on mips compile of strace

---
 package/strace/Makefile               |  3 ++-
 package/strace/patches/patch-signal_c | 12 ++++++++++--
 package/strace/src/sgidefs.h          | 30 ++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 package/strace/src/sgidefs.h

(limited to 'package')

diff --git a/package/strace/Makefile b/package/strace/Makefile
index 98647b555..c6880faa4 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -5,10 +5,11 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		strace
 PKG_VERSION:=		4.8
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		c575ef43829586801f514fd91bfe7575
 PKG_DESCR:=		System call trace program
 PKG_SECTION:=		debug
+PKG_DEPENDS:=		libgcc
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=strace/}
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
diff --git a/package/strace/patches/patch-signal_c b/package/strace/patches/patch-signal_c
index 041f7177b..27e3d0d77 100644
--- a/package/strace/patches/patch-signal_c
+++ b/package/strace/patches/patch-signal_c
@@ -1,6 +1,14 @@
 --- strace-4.8.orig/signal.c	2013-05-23 15:41:23.000000000 +0200
-+++ strace-4.8/signal.c	2013-08-14 08:50:16.000000000 +0200
-@@ -815,7 +815,7 @@ sys_sigreturn(struct tcb *tcp)
++++ strace-4.8/signal.c	2013-09-13 16:20:20.000000000 +0200
+@@ -61,6 +61,7 @@
+ #endif
+ 
+ #if defined(SPARC) || defined(SPARC64) || defined(MIPS)
++#include <asm/ptrace.h>
+ typedef struct {
+ 	struct pt_regs		si_regs;
+ 	int			si_mask;
+@@ -815,7 +816,7 @@ sys_sigreturn(struct tcb *tcp)
  {
  #if defined(ARM)
  	if (entering(tcp)) {
diff --git a/package/strace/src/sgidefs.h b/package/strace/src/sgidefs.h
new file mode 100644
index 000000000..a6d250ab7
--- /dev/null
+++ b/package/strace/src/sgidefs.h
@@ -0,0 +1,30 @@
+#ifndef _SGIDEFS_H
+#define _SGIDEFS_H
+
+/* MIPS ABI crap that GLIBC puts into /include
+by default, and GDB depends on it happily. */
+
+#define _MIPS_ISA_MIPS1 1
+#define _MIPS_ISA_MIPS2 2
+#define _MIPS_ISA_MIPS3 3
+#define _MIPS_ISA_MIPS4 4
+#define _MIPS_ISA_MIPS5 5
+#define _MIPS_ISA_MIPS32 6
+#define _MIPS_ISA_MIPS64 7
+
+#ifndef _ABIO32
+#define _ABIO32 1
+#endif
+#define _MIPS_SIM_ABI32 _ABIO32
+
+#ifndef _ABIN32
+#define _ABIN32 2
+#endif
+#define _MIPS_SIM_NABI32 _ABIN32
+
+#ifndef _ABI64
+#define _ABI64 3
+#endif
+#define _MIPS_SIM_ABI64 _ABI64
+
+#endif
-- 
cgit v1.2.3