From: Robert Yang <[email protected]> * Remove uneed patch, the src/resuse.c has been removed in 1.10: 0001-include-string.h-for-memset.patch
* Remove backported patches: 0002-maint-remove-K-R-declarations.patch 0003-maint-fix-compilation-errors-with-GCC-15.patch 0004-maint-remove-obsolete-autoconf-macros.patch Signed-off-by: Robert Yang <[email protected]> --- .../0001-include-string.h-for-memset.patch | 27 ---- .../0002-maint-remove-K-R-declarations.patch | 131 ------------------ ...t-fix-compilation-errors-with-GCC-15.patch | 65 --------- ...aint-remove-obsolete-autoconf-macros.patch | 43 ------ .../time/{time_1.9.bb => time_1.10.bb} | 9 +- 5 files changed, 2 insertions(+), 273 deletions(-) delete mode 100644 meta/recipes-extended/time/time/0001-include-string.h-for-memset.patch delete mode 100644 meta/recipes-extended/time/time/0002-maint-remove-K-R-declarations.patch delete mode 100644 meta/recipes-extended/time/time/0003-maint-fix-compilation-errors-with-GCC-15.patch delete mode 100644 meta/recipes-extended/time/time/0004-maint-remove-obsolete-autoconf-macros.patch rename meta/recipes-extended/time/{time_1.9.bb => time_1.10.bb} (61%) diff --git a/meta/recipes-extended/time/time/0001-include-string.h-for-memset.patch b/meta/recipes-extended/time/time/0001-include-string.h-for-memset.patch deleted file mode 100644 index 1258a0d5eb..0000000000 --- a/meta/recipes-extended/time/time/0001-include-string.h-for-memset.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ebc3368161ee909d5f854af8928e7937e35da41f Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Mon, 15 Aug 2022 07:24:24 -0700 -Subject: [PATCH 1/4] include string.h for memset() - -Fixes implicit function declaration warning e.g. - -resuse.c:103:3: error: call to undeclared library function 'memset' with type 'void *(void *, int, unsigned long)' - -Drop this patch when upgrading to 1.10+ future releases - -Upstream-Status: Inappropriate [Upstream has dropped using memset in reuse.c] -Signed-off-by: Khem Raj <[email protected]> ---- - src/resuse.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/src/resuse.c -+++ b/src/resuse.c -@@ -22,6 +22,7 @@ - */ - - #include "config.h" -+#include <string.h> - #include <sys/time.h> - #include <sys/wait.h> - #include <sys/resource.h> diff --git a/meta/recipes-extended/time/time/0002-maint-remove-K-R-declarations.patch b/meta/recipes-extended/time/time/0002-maint-remove-K-R-declarations.patch deleted file mode 100644 index cfa2b0f63b..0000000000 --- a/meta/recipes-extended/time/time/0002-maint-remove-K-R-declarations.patch +++ /dev/null @@ -1,131 +0,0 @@ -From b4a9f76b5f30bda67a57a2c6df6221f95ed80b9b Mon Sep 17 00:00:00 2001 -From: Collin Funk <[email protected]> -Date: Mon, 12 Jan 2026 20:19:34 -0800 -Subject: [PATCH 2/4] maint: remove K&R declarations - -* src/resuse.c (resuse_start, resuse_end): Remove K&R declarations. -* src/time.c (fprintargv, linear_argv, summarize, getargs) -(main): Likewise. -(run_command): Likewise. Avoid -Wincompatible-pointer-types. - -Upstream-Status: Backport [https://gitweb.git.savannah.gnu.org/gitweb/?p=time.git;a=commit;h=4eb6d87fc18929d75a444fbb05a2c4ec7fb052ba] -Signed-off-by: Khem Raj <[email protected]> ---- - src/resuse.c | 10 +--------- - src/time.c | 30 +++++++----------------------- - 2 files changed, 8 insertions(+), 32 deletions(-) - -diff --git a/src/resuse.c b/src/resuse.c -index 9d3d18a..5ba3057 100644 ---- a/src/resuse.c -+++ b/src/resuse.c -@@ -48,8 +48,7 @@ - /* Prepare to measure a child process. */ - - void --resuse_start (resp) -- RESUSE *resp; -+resuse_start (RESUSE *resp) - { - #if HAVE_WAIT3 - gettimeofday (&resp->start, (struct timezone *) 0); -@@ -66,16 +65,9 @@ resuse_start (resp) - /* Wait for and fill in data on child process PID. - Return 0 on error, 1 if ok. */ - --#if __STDC__ - /* pid_t is short on BSDI, so don't try to promote it. */ - int - resuse_end (pid_t pid, RESUSE *resp) --#else --int --resuse_end (pid, resp) -- pid_t pid; -- RESUSE *resp; --#endif - { - int status; - -diff --git a/src/time.c b/src/time.c -index 7e07995..4438749 100644 ---- a/src/time.c -+++ b/src/time.c -@@ -315,10 +315,7 @@ for details about the options it supports.\n", - /* Print ARGV to FP, with each entry in ARGV separated by FILLER. */ - - static void --fprintargv (fp, argv, filler) -- FILE *fp; -- const char *const *argv; -- const char *filler; -+fprintargv (FILE *fp, const char *const *argv, const char *filler) - { - const char *const *av; - -@@ -341,8 +338,7 @@ fprintargv (fp, argv, filler) - Print a message and return NULL if memory allocation failed. */ - - static char * --linear_argv (argv) -- const char *const *argv; -+linear_argv (const char *const *argv) - { - const char *const *s; /* Each string in ARGV. */ - char *new; /* Allocated space. */ -@@ -421,11 +417,7 @@ linear_argv (argv) - RESP is resource information on the command. */ - - static void --summarize (fp, fmt, command, resp) -- FILE *fp; -- const char *fmt; -- const char **command; -- RESUSE *resp; -+summarize (FILE *fp, const char *fmt, const char **command, RESUSE *resp) - { - unsigned long r; /* Elapsed real milliseconds. */ - unsigned long v; /* Elapsed virtual (CPU) milliseconds. */ -@@ -637,9 +629,7 @@ summarize (fp, fmt, command, resp) - Return the command line to run and gather statistics on. */ - - static const char ** --getargs (argc, argv) -- int argc; -- char **argv; -+getargs (int argc, char **argv) - { - int optc; - char *format; /* Format found in environment. */ -@@ -723,9 +713,7 @@ getargs (argc, argv) - Put the statistics in *RESP. */ - - static void --run_command (cmd, resp) -- char *const *cmd; -- RESUSE *resp; -+run_command (const char **cmd, RESUSE *resp) - { - pid_t pid; /* Pid of child. */ - sighandler interrupt_signal, quit_signal; -@@ -738,9 +726,7 @@ run_command (cmd, resp) - error (EXIT_CANCELED, errno, "cannot fork"); - else if (pid == 0) - { /* If child. */ -- /* Don't cast execvp arguments; that causes errors on some systems, -- versus merely warnings if the cast is left off. */ -- execvp (cmd[0], cmd); -+ execvp (cmd[0], (char * const *) cmd); - saved_errno = errno; - error (0, errno, "cannot run %s", cmd[0]); - _exit (saved_errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE); -@@ -759,9 +745,7 @@ run_command (cmd, resp) - } - - int --main (argc, argv) -- int argc; -- char **argv; -+main (int argc, char **argv) - { - const char **command_line; - RESUSE res; diff --git a/meta/recipes-extended/time/time/0003-maint-fix-compilation-errors-with-GCC-15.patch b/meta/recipes-extended/time/time/0003-maint-fix-compilation-errors-with-GCC-15.patch deleted file mode 100644 index ef78002468..0000000000 --- a/meta/recipes-extended/time/time/0003-maint-fix-compilation-errors-with-GCC-15.patch +++ /dev/null @@ -1,65 +0,0 @@ -From f178a9cf1ff71bbf1054ad85588b1b7a313ee584 Mon Sep 17 00:00:00 2001 -From: Collin Funk <[email protected]> -Date: Mon, 12 Jan 2026 20:42:21 -0800 -Subject: [PATCH 3/4] maint: fix compilation errors with GCC 15 - -GCC 15 changed the default to -std=gnu23 where the current code would -cause -Wincompatible-pointer-types errors. - -Reported by Ondrej Pohorelsky <[email protected]> in -<https://lists.gnu.org/r/bug-time/2025-01/msg00000.html> -and by Khem Raj <[email protected]> in -<https://lists.gnu.org/r/bug-time/2025-03/msg00000.html> -and by Marcin Serwin <[email protected]> in -<https://lists.gnu.org/r/bug-time/2025-10/msg00000.html> -and by Sam James <[email protected]> in -<https://savannah.gnu.org/bugs/?66450>. - -* configure.ac (AC_TYPE_SIGNAL): Remove obsolete macro. -* src/time.c (sighandler): Remove type. -(run_command): Use sighandler_t which is defined by glibc or provided by -Gnulib. - -Upstream-Status: Backport [https://gitweb.git.savannah.gnu.org/gitweb/?p=time.git;a=commit;h=4bfc492fcfa7778df7fc473ee901c1bdfdb02de0] -Signed-off-by: Khem Raj <[email protected]> ---- - configure.ac | 1 - - src/time.c | 6 +----- - 2 files changed, 1 insertion(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ede8fd5..beb2077 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -66,7 +66,6 @@ dnl Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST - AC_TYPE_PID_T - AC_TYPE_SIZE_T --AC_TYPE_SIGNAL - - dnl Checks for library functions. - AC_FUNC_VPRINTF -diff --git a/src/time.c b/src/time.c -index 4438749..b8309a0 100644 ---- a/src/time.c -+++ b/src/time.c -@@ -74,10 +74,6 @@ enum - "David MacKenzie", \ - "Assaf Gordon" - -- --/* A Pointer to a signal handler. */ --typedef RETSIGTYPE (*sighandler) (); -- - /* msec = milliseconds = 1/1,000 (1*10e-3) second. - usec = microseconds = 1/1,000,000 (1*10e-6) second. */ - -@@ -716,7 +712,7 @@ static void - run_command (const char **cmd, RESUSE *resp) - { - pid_t pid; /* Pid of child. */ -- sighandler interrupt_signal, quit_signal; -+ sighandler_t interrupt_signal, quit_signal; - int saved_errno; - - resuse_start (resp); diff --git a/meta/recipes-extended/time/time/0004-maint-remove-obsolete-autoconf-macros.patch b/meta/recipes-extended/time/time/0004-maint-remove-obsolete-autoconf-macros.patch deleted file mode 100644 index 4a49d79753..0000000000 --- a/meta/recipes-extended/time/time/0004-maint-remove-obsolete-autoconf-macros.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0b860a81d54b1d44823bd0b5ce3a817594fb388f Mon Sep 17 00:00:00 2001 -From: Collin Funk <[email protected]> -Date: Mon, 12 Jan 2026 21:06:53 -0800 -Subject: [PATCH 4/4] maint: remove obsolete autoconf macros - -* configure.ac (AC_PROG_CC): Call instead of AC_PROG_CC_STDC and -AC_PROG_GCC_TRADITIONAL. -(AC_CHECK_INCLUDES_DEFAULT, AC_PROG_EGREP): Use instead of -AC_HEADER_STDC. - -Upstream-Status: Backport [https://gitweb.git.savannah.gnu.org/gitweb/?p=time.git;a=commit;h=d957319127352cc67de4de5fd5d1537f289c0a84] -Signed-off-by: Khem Raj <[email protected]> ---- - configure.ac | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index beb2077..1af59c2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -27,10 +27,9 @@ AM_INIT_AUTOMAKE([ - - dnl Checks for programs. - AC_USE_SYSTEM_EXTENSIONS --AC_PROG_CC_STDC -+AC_PROG_CC - AM_PROG_CC_C_O - AC_PROG_CPP --AC_PROG_GCC_TRADITIONAL - AC_PROG_INSTALL - AC_C_INLINE - -@@ -59,7 +58,9 @@ gl_WARN_ADD([-Wsuggest-attribute=pure]) - AC_SUBST([WARN_CFLAGS]) - - dnl Checks for header files. --AC_HEADER_STDC -+AC_CHECK_INCLUDES_DEFAULT -+AC_PROG_EGREP -+ - AC_HEADER_SYS_WAIT - - dnl Checks for typedefs, structures, and compiler characteristics. diff --git a/meta/recipes-extended/time/time_1.9.bb b/meta/recipes-extended/time/time_1.10.bb similarity index 61% rename from meta/recipes-extended/time/time_1.9.bb rename to meta/recipes-extended/time/time_1.10.bb index 9436a83cca..d59fde4d92 100644 --- a/meta/recipes-extended/time/time_1.9.bb +++ b/meta/recipes-extended/time/time_1.10.bb @@ -13,14 +13,9 @@ ALTERNATIVE_PRIORITY = "100" BBCLASSEXTEND = "native nativesdk" -SRC_URI = "${GNU_MIRROR}/time/time-${PV}.tar.gz \ - file://0001-include-string.h-for-memset.patch \ - file://0002-maint-remove-K-R-declarations.patch \ - file://0003-maint-fix-compilation-errors-with-GCC-15.patch \ - file://0004-maint-remove-obsolete-autoconf-macros.patch \ - " +SRC_URI = "${GNU_MIRROR}/time/time-${PV}.tar.gz" -SRC_URI[sha256sum] = "fbacf0c81e62429df3e33bda4cee38756604f18e01d977338e23306a3e3b521e" +SRC_URI[sha256sum] = "e8c29fb4ab599d8478e41e8618f50db8aede9c90af27d0d2ef28ae50d5de09c3" inherit autotools -- 2.49.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#236720): https://lists.openembedded.org/g/openembedded-core/message/236720 Mute This Topic: https://lists.openembedded.org/mt/119215510/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
