From b84d6ceb89277462d7069defaeb9ecfed9c30d56 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 22 Aug 2025 01:04:14 +0200 Subject: [PATCH] unzip: Fix build with GCC-15 Add a patch to remove redundant declarations Signed-off-by: Khem Raj Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie Signed-off-by: Martin Jansa Signed-off-by: Steve Sakoman --- meta/recipes-extended/unzip/unzip/gcc15.patch | 18 ++++++++++++++++++ meta/recipes-extended/unzip/unzip_6.0.bb | 1 + 2 files changed, 19 insertions(+) create mode 100644 meta/recipes-extended/unzip/unzip/gcc15.patch diff --git a/meta/recipes-extended/unzip/unzip/gcc15.patch b/meta/recipes-extended/unzip/unzip/gcc15.patch new file mode 100644 index 00000000000..ab06a4713f4 --- /dev/null +++ b/meta/recipes-extended/unzip/unzip/gcc15.patch @@ -0,0 +1,18 @@ +Do not redefine gmtime(), localtime() + +They are already provided by system time.h header + +Upstream-Status: Inactive-Upstream [need a new release] + +Signed-off-by: Khem Raj +Signed-off-by: Martin Jansa +--- a/unix/unxcfg.h ++++ b/unix/unxcfg.h +@@ -117,7 +117,6 @@ typedef struct stat z_stat; + # endif + #else + # include +- struct tm *gmtime(), *localtime(); + #endif + + #if (defined(BSD4_4) || (defined(SYSV) && defined(MODERN))) diff --git a/meta/recipes-extended/unzip/unzip_6.0.bb b/meta/recipes-extended/unzip/unzip_6.0.bb index c13e7a008ea..0a88b4c092b 100644 --- a/meta/recipes-extended/unzip/unzip_6.0.bb +++ b/meta/recipes-extended/unzip/unzip_6.0.bb @@ -32,6 +32,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/ file://CVE-2022-0530.patch \ file://0001-configure-Add-correct-system-headers-and-prototypes-.patch \ file://0001-unix-configure-fix-detection-for-cross-compilation.patch \ + file://gcc15.patch \ " UPSTREAM_VERSION_UNKNOWN = "1" -- 2.47.3