diff options
author | Khem Raj <raj.khem@gmail.com> | 2022-03-25 13:54:14 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-29 15:59:28 +0100 |
commit | 9fa7faefc713d65c5d783454adb82238ecc74ce2 (patch) | |
tree | a9d1e6007a804ac82d466bdb0028f8ba7115a0cd /meta/recipes-extended | |
parent | 279e754d86eca3c5db6edb7f5bd170ba7712ca94 (diff) | |
download | poky-9fa7faefc713d65c5d783454adb82238ecc74ce2.tar.gz |
diffutils: Fix build on ppc/musl
Backport a patch from libsigsegv
(From OE-Core rev: 2115602f898f915c8e20358b5523da10d3b611f3)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/diffutils/diffutils/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch | 33 | ||||
-rw-r--r-- | meta/recipes-extended/diffutils/diffutils_3.8.bb | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-extended/diffutils/diffutils/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch b/meta/recipes-extended/diffutils/diffutils/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch new file mode 100644 index 0000000000..4928e1eaff --- /dev/null +++ b/meta/recipes-extended/diffutils/diffutils/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From f385ad6639380eb6dfa8b8eb4a5ba65dd12db744 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 25 Mar 2022 13:43:19 -0700 | ||
4 | Subject: [PATCH] mcontext is not a standard layout so glibc and musl differ | ||
5 | |||
6 | This is already applied to libsigsegv upstream, hopefully next version | ||
7 | of grep will update its internal copy and we can drop this patch | ||
8 | |||
9 | Upstream-Status: Backport [https://git.savannah.gnu.org/gitweb/?p=libsigsegv.git;a=commitdiff;h=a6ff69873110c0a8ba6f7fd90532dbc11224828c] | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | lib/sigsegv.c | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/lib/sigsegv.c b/lib/sigsegv.c | ||
17 | index 998c827..b6f4841 100644 | ||
18 | --- a/lib/sigsegv.c | ||
19 | +++ b/lib/sigsegv.c | ||
20 | @@ -219,8 +219,8 @@ int libsigsegv_version = LIBSIGSEGV_VERSION; | ||
21 | # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gp_regs[1] | ||
22 | # else /* 32-bit */ | ||
23 | /* both should be equivalent */ | ||
24 | -# if 0 | ||
25 | -# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1] | ||
26 | +# if ! defined __GLIBC__ | ||
27 | +# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_regs->gregs[1] | ||
28 | # else | ||
29 | # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] | ||
30 | # endif | ||
31 | -- | ||
32 | 2.35.1 | ||
33 | |||
diff --git a/meta/recipes-extended/diffutils/diffutils_3.8.bb b/meta/recipes-extended/diffutils/diffutils_3.8.bb index 8c3b9b0e5a..8889c83ee2 100644 --- a/meta/recipes-extended/diffutils/diffutils_3.8.bb +++ b/meta/recipes-extended/diffutils/diffutils_3.8.bb | |||
@@ -6,6 +6,7 @@ require diffutils.inc | |||
6 | SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ | 6 | SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ |
7 | file://run-ptest \ | 7 | file://run-ptest \ |
8 | file://0001-Skip-strip-trailing-cr-test-case.patch \ | 8 | file://0001-Skip-strip-trailing-cr-test-case.patch \ |
9 | file://0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch \ | ||
9 | " | 10 | " |
10 | 11 | ||
11 | SRC_URI[sha256sum] = "a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec" | 12 | SRC_URI[sha256sum] = "a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec" |