From 19de9be982068873bdaa7a44f9e10bf317a77999 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 19 Sep 2017 09:31:58 -0700 Subject: 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 Signed-off-by: Martin Jansa --- .../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 diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/mips_asm_sgidefs.patch b/meta-oe/recipes-devtools/breakpad/breakpad/mips_asm_sgidefs.patch new file mode 100644 index 0000000000..678f63d74a --- /dev/null +++ b/meta-oe/recipes-devtools/breakpad/breakpad/mips_asm_sgidefs.patch @@ -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 + + #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 +-#else +-#include +-#endif + #endif + #endif + diff --git a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb b/meta-oe/recipes-devtools/breakpad/breakpad_git.bb index 9a1255594e..1ddd6b5655 100644 --- a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb +++ b/meta-oe/recipes-devtools/breakpad/breakpad_git.bb @@ -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" -- cgit v1.2.3-54-g00ecf