mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-04 23:02:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

diffutils: update 3.8 -> 3.9

Browse Source 
Drop patch as issue fixed upstream.

(From OE-Core rev: e5ec5de7217de28bccf3243496df6b41ca8a1d0b)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2023-02-08 08:20:54 +01:00
committed by Richard Purdie
parent 1ab438d7d3
commit e0ea87498d
3 changed files with 6 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch
View File

@@ -1,4 +1,4 @@
From bd7fb8be2ae2d75347cf7733302d5093046ffa85 Mon Sep 17 00:00:00 2001
From 027229d25392b22d7280c0abbc3efde4f467d167 Mon Sep 17 00:00:00 2001
From: Peiran Hong <peiran.hong@windriver.com>
Date: Thu, 5 Sep 2019 15:42:22 -0400
Subject: [PATCH] Skip strip-trailing-cr test case
@@ -10,19 +10,21 @@ package.
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Peiran Hong <peiran.hong@windriver.com>
---
tests/Makefile.am | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 83a7c9d..04d51b5 100644
index d98df82..757ea52 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,8 +21,10 @@ TESTS = \
@@ -21,9 +21,11 @@ TESTS = \
stdin \
strcoll-0-names \
filename-quoting \
- strip-trailing-cr \
timezone \
colors
+# Skipping this test since it requires valgrind
+# and thus is too heavy for diffutils package
@@ -30,6 +32,3 @@ index 83a7c9d..04d51b5 100644
XFAIL_TESTS = large-subopt
--
2.21.0

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

@@ -1,33 +0,0 @@
From f385ad6639380eb6dfa8b8eb4a5ba65dd12db744 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 25 Mar 2022 13:43:19 -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

3
meta/recipes-extended/diffutils/diffutils_3.8.bb → meta/recipes-extended/diffutils/diffutils_3.9.bb
View File

@@ -6,10 +6,9 @@ require diffutils.inc
SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \
file://run-ptest \
file://0001-Skip-strip-trailing-cr-test-case.patch \
file://0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch \
"
SRC_URI[sha256sum] = "a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec"
SRC_URI[sha256sum] = "d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1"
EXTRA_OECONF += "ac_cv_path_PR_PROGRAM=${bindir}/pr --without-libsigsegv-prefix"