openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-21 19:14:30 +04:00
Code Issues Packages Projects Releases Wiki Activity

unzip: fix build GCC 15.1

Browse Source 
refer to:

b7410ac718/main/unzip/gcc15.patch

fix this:

unix/unxcfg.h:120:15: error: conflicting types for 'gmtime'; have 'struct tm *(void)'
  120 |    struct tm *gmtime(), *localtime();
      |               ^~~~~~
In file included from unix/unxcfg.h:119:
/home/nasbdh9/openwrt/staging_dir/toolchain-x86_64_gcc-15.1.0_musl/include/time.h:59:12: note: previous declaration of 'gmtime' with type 'struct tm *(const time_t *)' {aka 'struct tm *(const long int *)'}
   59 | struct tm *gmtime (const time_t *);
      |            ^~~~~~
unix/unxcfg.h:120:26: error: conflicting types for 'localtime'; have 'struct tm *(void)'
  120 |    struct tm *gmtime(), *localtime();
      |                          ^~~~~~~~~
/home/nasbdh9/openwrt/staging_dir/toolchain-x86_64_gcc-15.1.0_musl/include/time.h:60:12: note: previous declaration of 'localtime' with type 'struct tm *(const time_t *)' {aka 'struct tm *(const long int *)'}
   60 | struct tm *localtime (const time_t *);
      |            ^~~~~~~~~

Signed-off-by: Tan Zien <nabsdh9@gmail.com>
This commit is contained in:
Tan Zien
2025-07-06 08:11:40 +08:00
committed by Tianling Shen
parent ab6ebc5c01
commit d3a2fb39a7
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/unzip/Makefile
View File

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=unzip PKG_NAME:=unzip
PKG_REV:=60 PKG_REV:=60
PKG_VERSION:=6.0 PKG_VERSION:=6.0
PKG_RELEASE:=8 PKG_RELEASE:=9
PKG_SOURCE:=$(PKG_NAME)$(PKG_REV).tar.gz PKG_SOURCE:=$(PKG_NAME)$(PKG_REV).tar.gz
PKG_SOURCE_URL:=@SF/infozip PKG_SOURCE_URL:=@SF/infozip

11
utils/unzip/patches/012-fix-gcc15-build.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/unix/unxcfg.h
+++ b/unix/unxcfg.h
@@ -117,7 +117,7 @@ typedef struct stat z_stat;
# endif
#else
# include <time.h>
- struct tm *gmtime(), *localtime();
+ struct tm *gmtime(const time_t *), *localtime(const time_t *);
#endif
#if (defined(BSD4_4) || (defined(SYSV) && defined(MODERN)))