Skip to contentSkip to conversation

ltrace: Fix build with musl/mips

PATCH New Khem Raj 1 participant 2 messages Sep 19, 2017

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 ltrace: Fix build with musl/mips

Signed-off-by Khem Raj <[email protected]>
---
 .../0001-mips-plt.c-Delete-include-error.h.patch   | 27 ++++++++++++++++++++++
 meta-oe/recipes-devtools/ltrace/ltrace_git.bb      |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/ltrace/ltrace/0001-mips-plt.c-Delete-include-error.h.patch
meta-oe/recipes-devtools/ltrace/ltrace/0001-mips-plt.c-Delete-include-error.h.patch new file +27 -0
new file mode 100644
index 000000000..76ba7de78
@@ -0,0 +1,27 @@
+From 19a3e590c97420bd3952301bf376067c75d0ee32 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Mon, 18 Sep 2017 23:45:54 -0700
+Subject: [PATCH] mips/plt.c: Delete include error.h
+
+Its not needed
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+ sysdeps/linux-gnu/mips/plt.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/sysdeps/linux-gnu/mips/plt.c b/sysdeps/linux-gnu/mips/plt.c
+index 2d85ad9..9c3ae2f 100644
+--- a/sysdeps/linux-gnu/mips/plt.c
++++ b/sysdeps/linux-gnu/mips/plt.c
+@@ -24,7 +24,6 @@
+ 
+ #include <sys/ptrace.h>
+ #include <errno.h>
+-#include <error.h>
+ #include <gelf.h>
+ #include <inttypes.h>
+ #include <string.h>
+-- 
+2.14.1
+
meta-oe/recipes-devtools/ltrace/ltrace_git.bb +1 -0
index 01b3bbe1b..abe015de2 100644
@@ -24,6 +24,7 @@ SRC_URI = "git://anonscm.debian.org/collab-maint/ltrace.git;branch=master \
            file://0001-Fix-tautological-compare-warning.patch \
            file://0001-Add-support-for-mips64-n32-n64.patch \
            file://0001-configure-Recognise-linux-musl-as-a-host-OS.patch \
+           file://0001-mips-plt.c-Delete-include-error.h.patch \
            "
 S = "${WORKDIR}/git"
Signature · 1 line
2.14.1
author
#1 lore raw

PATCH 2/2 breakpad: Fix mips build on musl

There still are issues but this makes it better
and fix can be upstreamed

Signed-off-by Khem Raj <[email protected]>
---
 .../breakpad/breakpad/mips_asm_sgidefs.patch         | 20 ++++++++++++++++++++
 meta-oe/recipes-devtools/breakpad/breakpad_git.bb    |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/breakpad/breakpad/mips_asm_sgidefs.patch
meta-oe/recipes-devtools/breakpad/breakpad/mips_asm_sgidefs.patch new file +20 -0
new file mode 100644
index 000000000..678f63d74
@@ -0,0 +1,20 @@
+Index: lss/linux_syscall_support.h
+===================================================================
+--- lss.orig/linux_syscall_support.h
++++ lss/linux_syscall_support.h
+@@ -118,15 +118,7 @@ extern "C" {
+ #include <endian.h>
+ 
+ #ifdef __mips__
+-/* Include definitions of the ABI currently in use.                          */
+-#ifdef __ANDROID__
+-/* Android doesn't have sgidefs.h, but does have asm/sgidefs.h,
+- * which has the definitions we need.
+- */
+ #include <asm/sgidefs.h>
+-#else
+-#include <sgidefs.h>
+-#endif
+ #endif
+ #endif
+
meta-oe/recipes-devtools/breakpad/breakpad_git.bb +1 -0
index 9a1255594..1ddd6b565 100644
@@ -41,6 +41,7 @@ SRC_URI = "git://github.com/google/breakpad;name=breakpad \
            file://0005-md2core-Replace-basename.patch \
            file://0002-Use-_fpstate-instead-of-_libc_fpstate-on-linux.patch \
            file://0001-lss-Match-syscalls-to-match-musl.patch;patchdir=src/third_party/lss \
+           file://mips_asm_sgidefs.patch;patchdir=src/third_party/lss \
 "
 S = "${WORKDIR}/git"
Signature · 1 line
2.14.1