diff options
-rw-r--r-- | meta/recipes-extended/grep/grep/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch | 32 | ||||
-rw-r--r-- | meta/recipes-extended/grep/grep_3.8.bb (renamed from meta/recipes-extended/grep/grep_3.7.bb) | 8 |
2 files changed, 3 insertions, 37 deletions
diff --git a/meta/recipes-extended/grep/grep/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch b/meta/recipes-extended/grep/grep/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch deleted file mode 100644 index d8283d31b1..0000000000 --- a/meta/recipes-extended/grep/grep/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From 981385237834bdf3e468421147eece68d9bfc7e7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 25 Mar 2022 13:34:26 -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 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | lib/sigsegv.c | 4 ++-- | ||
13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/lib/sigsegv.c b/lib/sigsegv.c | ||
16 | index 998c827..b6f4841 100644 | ||
17 | --- a/lib/sigsegv.c | ||
18 | +++ b/lib/sigsegv.c | ||
19 | @@ -219,8 +219,8 @@ int libsigsegv_version = LIBSIGSEGV_VERSION; | ||
20 | # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gp_regs[1] | ||
21 | # else /* 32-bit */ | ||
22 | /* both should be equivalent */ | ||
23 | -# if 0 | ||
24 | -# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1] | ||
25 | +# if ! defined __GLIBC__ | ||
26 | +# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_regs->gregs[1] | ||
27 | # else | ||
28 | # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] | ||
29 | # endif | ||
30 | -- | ||
31 | 2.35.1 | ||
32 | |||
diff --git a/meta/recipes-extended/grep/grep_3.7.bb b/meta/recipes-extended/grep/grep_3.8.bb index 7005cbe164..be2caaa920 100644 --- a/meta/recipes-extended/grep/grep_3.7.bb +++ b/meta/recipes-extended/grep/grep_3.8.bb | |||
@@ -6,11 +6,9 @@ SECTION = "console/utils" | |||
6 | LICENSE = "GPL-3.0-only" | 6 | LICENSE = "GPL-3.0-only" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" |
8 | 8 | ||
9 | SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz \ | 9 | SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz" |
10 | file://0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch \ | ||
11 | " | ||
12 | 10 | ||
13 | SRC_URI[sha256sum] = "5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c" | 11 | SRC_URI[sha256sum] = "498d7cc1b4fb081904d87343febb73475cf771e424fb7e6141aff66013abc382" |
14 | 12 | ||
15 | inherit autotools gettext texinfo pkgconfig | 13 | inherit autotools gettext texinfo pkgconfig |
16 | 14 | ||
@@ -36,7 +34,7 @@ do_install () { | |||
36 | inherit update-alternatives | 34 | inherit update-alternatives |
37 | 35 | ||
38 | PACKAGECONFIG ??= "pcre" | 36 | PACKAGECONFIG ??= "pcre" |
39 | PACKAGECONFIG[pcre] = "--enable-perl-regexp,--disable-perl-regexp,libpcre" | 37 | PACKAGECONFIG[pcre] = "--enable-perl-regexp,--disable-perl-regexp,libpcre2" |
40 | 38 | ||
41 | ALTERNATIVE_PRIORITY = "100" | 39 | ALTERNATIVE_PRIORITY = "100" |
42 | 40 | ||