From a792a8e4e47666ae1ecfc8ac496486c6983c7cf3 Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Thu, 20 Feb 2025 13:44:35 -0700 Subject: diffutils: Refresh patches Refresh the diffutils patches for the latest version. The stricoll() patch can be dropped as upstream removed usage of stricoll() Signed-off-by: Joshua Watt --- .../0001-sdiff-Match-execvp-argument-types.patch | 27 ++++++++++------ ...002-Define-stricoll-as-_stricoll-on-mingw.patch | 37 ---------------------- recipes-extended/diffutils/diffutils_%.bbappend | 2 +- 3 files changed, 19 insertions(+), 47 deletions(-) delete mode 100644 recipes-extended/diffutils/diffutils/0002-Define-stricoll-as-_stricoll-on-mingw.patch diff --git a/recipes-extended/diffutils/diffutils/0001-sdiff-Match-execvp-argument-types.patch b/recipes-extended/diffutils/diffutils/0001-sdiff-Match-execvp-argument-types.patch index 2dff6db..935e435 100644 --- a/recipes-extended/diffutils/diffutils/0001-sdiff-Match-execvp-argument-types.patch +++ b/recipes-extended/diffutils/diffutils/0001-sdiff-Match-execvp-argument-types.patch @@ -1,7 +1,7 @@ -From 197c0c72a6cb60a647db02c2874a8103be4557d6 Mon Sep 17 00:00:00 2001 +From 4e1aa44797f5629d4654623235c06ec3331b3749 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 29 May 2024 10:58:54 -0700 -Subject: [PATCH 1/2] sdiff: Match execvp argument types +Subject: [PATCH] sdiff: Match execvp argument types Fixes build with GCC-14 @@ -16,22 +16,31 @@ Fixes build with GCC-14 Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-diffutils/2024-05/msg00003.html] Signed-off-by: Khem Raj --- - src/sdiff.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/sdiff.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sdiff.c b/src/sdiff.c -index 0b638d4..a4642b1 100644 +index 07b4510..7ccdbe8 100644 --- a/src/sdiff.c +++ b/src/sdiff.c -@@ -576,7 +576,7 @@ main (int argc, char *argv[]) +@@ -573,7 +573,7 @@ main (int argc, char *argv[]) diffarg (argv[optind]); diffarg (argv[optind + 1]); - diffarg (0); + diffarg (nullptr); - execvp (diffargv[0], (char **) diffargv); + execvp (diffargv[0], diffargv); - perror_fatal (diffargv[0]); + perror_fatal (squote (0, diffargv[0])); } else +@@ -636,7 +636,7 @@ main (int argc, char *argv[]) + close (diff_fds[1]); + } + +- execvp (diffargv[0], (char **) diffargv); ++ execvp (diffargv[0], diffargv); + _exit (errno == ENOENT ? 127 : 126); + } + -- -2.45.1 +2.47.1 diff --git a/recipes-extended/diffutils/diffutils/0002-Define-stricoll-as-_stricoll-on-mingw.patch b/recipes-extended/diffutils/diffutils/0002-Define-stricoll-as-_stricoll-on-mingw.patch deleted file mode 100644 index 23807c6..0000000 --- a/recipes-extended/diffutils/diffutils/0002-Define-stricoll-as-_stricoll-on-mingw.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9e1318440a5f7f4a00f077fc3cbd1edc07e0985d Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 29 May 2024 21:20:12 -0700 -Subject: [PATCH 2/2] Define stricoll as _stricoll on mingw - -* src/system.h: Define stricoll as _stricoll on mingw. - -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/bug-diffutils/2024-05/msg00004.html] -Signed-off-by: Khem Raj ---- - src/system.h | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/system.h b/src/system.h -index b37893f..4c7a318 100644 ---- a/src/system.h -+++ b/src/system.h -@@ -63,6 +63,16 @@ - #include - - #include -+/* stricoll is not provided by any headers on windows/mingw -+ only _stricoll is provided, the function is however aliased -+ to provide stricoll in runtime libraries, the configure check -+ to detect stricoll defines the prototype in generated test -+ itself and thus test passes, however compiling fails with -+ GCC-14 which enables implicit-function-declaration as error */ -+#if defined _WIN32 && ! defined __CYGWIN__ -+#define stricoll _stricoll -+#endif -+ - #if ! HAVE_STRCASECOLL - # if HAVE_STRICOLL || defined stricoll - # define strcasecoll(a, b) stricoll (a, b) --- -2.45.1 - diff --git a/recipes-extended/diffutils/diffutils_%.bbappend b/recipes-extended/diffutils/diffutils_%.bbappend index 284f8cb..177809b 100644 --- a/recipes-extended/diffutils/diffutils_%.bbappend +++ b/recipes-extended/diffutils/diffutils_%.bbappend @@ -5,7 +5,7 @@ CFLAGS:append:mingw32 = " -DSIGALRM=14 -DSIGHUP=1 -DSIGQUIT=3 -DSIGPIPE=13 -DSIG SRC_URI:append:mingw32 = "\ file://0001-sdiff-Match-execvp-argument-types.patch \ - file://0002-Define-stricoll-as-_stricoll-on-mingw.patch" + " do_configure:prepend:mingw32 () { # Remove building of "man" and "gnulib-tests". The tests don't -- cgit v1.2.3-54-g00ecf