mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-21 00:49:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

grep: update 3.7 -> 3.8

Browse Source 
(From OE-Core rev: f69355219cb0ead23113f77cb29a7caacfde9611)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2022-10-27 22:15:53 +02:00
committed by Richard Purdie
parent 507a50cf29
commit a78ada8639
2 changed files with 3 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
meta/recipes-extended/grep/grep/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch
View File

@@ -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

8
meta/recipes-extended/grep/grep_3.7.bb → meta/recipes-extended/grep/grep_3.8.bb
View File

@@ -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"