summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-02-10 17:43:33 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-11 12:27:44 +0000
commit40e4e8c58e40844dd775cd3ee00f88301ad38072 (patch)
treedc449c4a4d95adb8661d9fc5c860bc37eeee3e1c
parent299b426c5166c62d62d546aff231dd95da08a9ca (diff)
downloadpoky-40e4e8c58e40844dd775cd3ee00f88301ad38072.tar.gz
strace: build fix for MIPS + musl libc
The MIPS specific header <sgidefs.h> is provided by glibc and uclibc but not by musl. Regardless of the libc, the kernel headers provide <asm/sgidefs.h> which provides the same definitions, so use that instead. (From OE-Core rev: 785fb18d328988d607c38e4818ba2f3227a36feb) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/strace/strace/use-asm-sgidefs.h.patch51
-rw-r--r--meta/recipes-devtools/strace/strace_4.11.bb1
2 files changed, 52 insertions, 0 deletions
diff --git a/meta/recipes-devtools/strace/strace/use-asm-sgidefs.h.patch b/meta/recipes-devtools/strace/strace/use-asm-sgidefs.h.patch
new file mode 100644
index 0000000000..db83d1130e
--- /dev/null
+++ b/meta/recipes-devtools/strace/strace/use-asm-sgidefs.h.patch
@@ -0,0 +1,51 @@
1From 2995245d7e3f46e8b3995002995ebd28beca7d55 Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Fri, 5 Feb 2016 14:00:00 -0800
4Subject: [PATCH] use <asm/sgidefs.h>
5
6Build fix for MIPS with musl libc.
7
8The MIPS specific header <sgidefs.h> is provided by glibc and uclibc
9but not by musl. Regardless of the libc, the kernel headers provide
10<asm/sgidefs.h> which provides the same definitions, so use that
11instead.
12
13Upstream-Status: Pending
14
15Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
16---
17 configure.ac | 8 ++++----
18 1 file changed, 4 insertions(+), 4 deletions(-)
19
20diff --git a/configure.ac b/configure.ac
21index 1524b9b..287e03d 100644
22--- a/configure.ac
23+++ b/configure.ac
24@@ -196,20 +196,20 @@ AC_SUBST(arch_mx32)
25 if test "$arch" = mips; then
26 AC_CACHE_CHECK([for _MIPS_SIM], [st_cv__MIPS_SIM],
27 [AC_COMPUTE_INT([st_cv__MIPS_SIM], [_MIPS_SIM],
28- [#include <sgidefs.h>],
29+ [#include <asm/sgidefs.h>],
30 [AC_MSG_ERROR([_MIPS_SIM cannot be determined])])])
31
32 AC_CACHE_CHECK([for MIPS ABI], [st_cv_mips_abi],
33 [AC_COMPILE_IFELSE(
34- [AC_LANG_PROGRAM([[#include <sgidefs.h>]],
35+ [AC_LANG_PROGRAM([[#include <asm/sgidefs.h>]],
36 [[int i[_MIPS_SIM == _MIPS_SIM_ABI32 ? 1 : - 1];]])],
37 [st_cv_mips_abi=o32],
38 [AC_COMPILE_IFELSE(
39- [AC_LANG_PROGRAM([[#include <sgidefs.h>]],
40+ [AC_LANG_PROGRAM([[#include <asm/sgidefs.h>]],
41 [[int i[_MIPS_SIM == _MIPS_SIM_NABI32 ? 1 : - 1];]])],
42 [st_cv_mips_abi=n32],
43 [AC_COMPILE_IFELSE(
44- [AC_LANG_PROGRAM([[#include <sgidefs.h>]],
45+ [AC_LANG_PROGRAM([[#include <asm/sgidefs.h>]],
46 [[int i[_MIPS_SIM == _MIPS_SIM_ABI64 ? 1 : - 1];]])],
47 [st_cv_mips_abi=n64],
48 [st_cv_mips_abi=unknown])])])])
49--
501.9.1
51
diff --git a/meta/recipes-devtools/strace/strace_4.11.bb b/meta/recipes-devtools/strace/strace_4.11.bb
index a72a1f9c24..95d13e6bb9 100644
--- a/meta/recipes-devtools/strace/strace_4.11.bb
+++ b/meta/recipes-devtools/strace/strace_4.11.bb
@@ -8,6 +8,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \
8 file://disable-git-version-gen.patch \ 8 file://disable-git-version-gen.patch \
9 file://more-robust-test-for-m32-mx32-compile-support.patch \ 9 file://more-robust-test-for-m32-mx32-compile-support.patch \
10 file://update-gawk-paths.patch \ 10 file://update-gawk-paths.patch \
11 file://use-asm-sgidefs.h.patch \
11 file://Makefile-ptest.patch \ 12 file://Makefile-ptest.patch \
12 file://run-ptest \ 13 file://run-ptest \
13 " 14 "