diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2025-10-05 20:54:14 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2025-10-05 20:54:14 +0200 |
commit | a878bba25483a62161841561bea4968d5d0e0094 (patch) | |
tree | 4669bab82f93eedac3268ba6c938972ad89d0b83 | |
parent | e8188d2023ae388d57f1eeb1a450a298eb3bc26b (diff) |
zip: fix gcc 14.x issue
-rw-r--r-- | package/zip/Makefile | 2 | ||||
-rw-r--r-- | package/zip/patches/patch-timezone_c | 10 | ||||
-rw-r--r-- | package/zip/patches/patch-unix_configure | 14 |
3 files changed, 25 insertions, 1 deletions
diff --git a/package/zip/Makefile b/package/zip/Makefile index 77f6c6f1c..991963c33 100644 --- a/package/zip/Makefile +++ b/package/zip/Makefile @@ -31,7 +31,7 @@ MAKE_FILE:= unix/Makefile ALL_TARGET:= generic_gcc host-build: - (cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ + (cd ${WRKBUILD} && env ${HOST_MAKE_ENV} CC="$(HOST_CC) -std=gnu89" ${MAKE} -f ${MAKE_FILE} \ ${HOST_MAKE_FLAGS} ${ALL_TARGET}) zip-hostinstall: diff --git a/package/zip/patches/patch-timezone_c b/package/zip/patches/patch-timezone_c new file mode 100644 index 000000000..9f549df5c --- /dev/null +++ b/package/zip/patches/patch-timezone_c @@ -0,0 +1,10 @@ +--- zip30.orig/timezone.c 2004-11-13 09:35:12.000000000 +0100 ++++ zip30/timezone.c 2025-10-05 03:57:25.603996335 +0200 +@@ -41,6 +41,7 @@ + #include "timezone.h" + #include <ctype.h> + #include <errno.h> ++#include <time.h> + + #ifdef IZTZ_DEFINESTDGLOBALS + long timezone = 0; diff --git a/package/zip/patches/patch-unix_configure b/package/zip/patches/patch-unix_configure new file mode 100644 index 000000000..d177b83f8 --- /dev/null +++ b/package/zip/patches/patch-unix_configure @@ -0,0 +1,14 @@ +--- zip30.orig/unix/configure 2008-06-20 05:32:20.000000000 +0200 ++++ zip30/unix/configure 2025-10-05 03:55:24.305239765 +0200 +@@ -519,7 +519,10 @@ done + + + echo Check for memset +-echo "int main(){ char k; memset(&k,0,0); return 0; }" > conftest.c ++cat > conftest.c << _EOF_ ++#include <string.h> ++int main(){ char k; memset(&k,0,0); return 0; } ++_EOF_ + $CC -o conftest conftest.c >/dev/null 2>/dev/null + [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DZMEM" + |