diff options
| -rw-r--r-- | meta/recipes-extended/unzip/unzip/gcc15.patch | 17 | ||||
| -rw-r--r-- | meta/recipes-extended/unzip/unzip_6.0.bb | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/meta/recipes-extended/unzip/unzip/gcc15.patch b/meta/recipes-extended/unzip/unzip/gcc15.patch new file mode 100644 index 0000000000..42a2f81681 --- /dev/null +++ b/meta/recipes-extended/unzip/unzip/gcc15.patch | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | Do not redefine gmtime(), localtime() | ||
| 2 | |||
| 3 | They are already provided by system time.h header | ||
| 4 | |||
| 5 | Upstream-Status: Inactive-Upstream [need a new release] | ||
| 6 | |||
| 7 | Sign-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 8 | --- a/unix/unxcfg.h | ||
| 9 | +++ b/unix/unxcfg.h | ||
| 10 | @@ -117,7 +117,6 @@ typedef struct stat z_stat; | ||
| 11 | # endif | ||
| 12 | #else | ||
| 13 | # include <time.h> | ||
| 14 | - struct tm *gmtime(), *localtime(); | ||
| 15 | #endif | ||
| 16 | |||
| 17 | #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 c13e7a008e..0a88b4c092 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/ | |||
| 32 | file://CVE-2022-0530.patch \ | 32 | file://CVE-2022-0530.patch \ |
| 33 | file://0001-configure-Add-correct-system-headers-and-prototypes-.patch \ | 33 | file://0001-configure-Add-correct-system-headers-and-prototypes-.patch \ |
| 34 | file://0001-unix-configure-fix-detection-for-cross-compilation.patch \ | 34 | file://0001-unix-configure-fix-detection-for-cross-compilation.patch \ |
| 35 | file://gcc15.patch \ | ||
| 35 | " | 36 | " |
| 36 | UPSTREAM_VERSION_UNKNOWN = "1" | 37 | UPSTREAM_VERSION_UNKNOWN = "1" |
| 37 | 38 | ||
