diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2022-10-27 22:15:53 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-10-29 16:23:26 +0100 |
| commit | f69355219cb0ead23113f77cb29a7caacfde9611 (patch) | |
| tree | 0f2f70710a8b460b299a575cfccd0b88430cf0f7 /meta/recipes-extended | |
| parent | 20adf74207b8c3eac7871e27da2df1aa26fca3b6 (diff) | |
| download | openembedded-core-contrib-f69355219cb0ead23113f77cb29a7caacfde9611.tar.gz | |
grep: update 3.7 -> 3.8
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'meta/recipes-extended')
| -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 @@ -From 981385237834bdf3e468421147eece68d9bfc7e7 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 25 Mar 2022 13:34:26 -0700 -Subject: [PATCH] mcontext is not a standard layout so glibc and musl differ - -This is already applied to libsigsegv upstream, hopefully next version -of grep will update its internal copy and we can drop this patch - -Upstream-Status: Backport [https://git.savannah.gnu.org/gitweb/?p=libsigsegv.git;a=commitdiff;h=a6ff69873110c0a8ba6f7fd90532dbc11224828c] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - lib/sigsegv.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/sigsegv.c b/lib/sigsegv.c -index 998c827..b6f4841 100644 ---- a/lib/sigsegv.c -+++ b/lib/sigsegv.c -@@ -219,8 +219,8 @@ int libsigsegv_version = LIBSIGSEGV_VERSION; - # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gp_regs[1] - # else /* 32-bit */ - /* both should be equivalent */ --# if 0 --# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1] -+# if ! defined __GLIBC__ -+# define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_regs->gregs[1] - # else - # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1] - # endif --- -2.35.1 - 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" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" -SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz \ - file://0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch \ - " +SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz" -SRC_URI[sha256sum] = "5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c" +SRC_URI[sha256sum] = "498d7cc1b4fb081904d87343febb73475cf771e424fb7e6141aff66013abc382" inherit autotools gettext texinfo pkgconfig @@ -36,7 +34,7 @@ do_install () { inherit update-alternatives PACKAGECONFIG ??= "pcre" -PACKAGECONFIG[pcre] = "--enable-perl-regexp,--disable-perl-regexp,libpcre" +PACKAGECONFIG[pcre] = "--enable-perl-regexp,--disable-perl-regexp,libpcre2" ALTERNATIVE_PRIORITY = "100" |