tools/7z: update to 24.05

Update to a more recent stable release.

Most notably, this version includes
some fixes for building on an OS like Alpine.
This allows for the removal of hacks
that fixed building on Alpine,
but broke building on ARM archs.

Manually adjust:
- 7-zip-flags.patch
- 7-zip-musl.patch

Link: https://7-zip.org/history.txt
Signed-off-by: Michael Pratt <mcpratt@pm.me>
Link: https://github.com/openwrt/openwrt/pull/15991
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/tools/7z/Makefile b/tools/7z/Makefile
index 3b3ceeb0966efcddab54a69c3682b68c91de6fe5..962fd5729c02938dc03aaf26c9f3d79ef3a4a0be 100644 (file)
--- a/tools/7z/Makefile
+++ b/tools/7z/Makefile
@@ -1,11 +1,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=7z
-PKG_VERSION:=23.01
+PKG_VERSION:=24.05
 
 PKG_SOURCE:=$(PKG_NAME)$(subst .,,$(PKG_VERSION))-src.tar.xz
 PKG_SOURCE_URL:=https://7-zip.org/a/
-PKG_HASH:=356071007360e5a1824d9904993e8b2480b51b570e8c9faf7c0f58ebe4bf9f74
+PKG_HASH:=63f341cf80b8d287c6e945519b3da0fa75553c85572a471b7fa6e68f9a90b790
 
 PKG_CPE_ID:=cpe:/a:7-zip:7-zip
 

diff --git a/tools/7z/patches/7-zip-flags.patch b/tools/7z/patches/7-zip-flags.patch
index b9b2152f22a677851ff9d05f84f75bd0e3eaec91..5c684b0689af75003766e568b17e736b1fb95495 100644 (file)
--- a/tools/7z/patches/7-zip-flags.patch
+++ b/tools/7z/patches/7-zip-flags.patch
@@ -9,12 +9,12 @@
  endif\r
  \r
  # for object file\r
-@@ -32,7 +32,7 @@ endif
- # -save-temps\r
- CFLAGS_BASE_LIST = -c\r
+@@ -50,7 +50,7 @@ endif
+ endif\r
+ \r
  # CFLAGS_BASE_LIST = -S\r
 -CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \\r
 +CFLAGS_BASE = $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) -D_GNU_SOURCE \\r
-  -DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \\r
+  $(CFLAGS_DEBUG) -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \\r
   -fPIC\r
  \r

diff --git a/tools/7z/patches/7-zip-musl.patch b/tools/7z/patches/7-zip-musl.patch
index e066cc8ec91a1d846aad19e46caa8b86bf4a75a4..a08520a25ffa0c31601ed4586747b098b7f40b1b 100644 (file)
--- a/tools/7z/patches/7-zip-musl.patch
+++ b/tools/7z/patches/7-zip-musl.patch
@@ -1,14 +1,3 @@
---- a/C/CpuArch.c
-+++ b/C/CpuArch.c
-@@ -766,8 +766,6 @@ BoolInt CPU_IsSupported_AES (void) { ret
- \r
- #ifdef USE_HWCAP\r
- \r
--#include <asm/hwcap.h>\r
--\r
-   #define MY_HWCAP_CHECK_FUNC_2(name1, name2) \\r
-   BoolInt CPU_IsSupported_ ## name1() { return (getauxval(AT_HWCAP)  & (HWCAP_  ## name2)) ? 1 : 0; }\r
- \r
 --- a/C/Threads.c
 +++ b/C/Threads.c
 @@ -265,7 +265,7 @@ WRes Thread_Create_With_CpuSet(CThread *
@@ -18,7 +7,7 @@
 -      pthread_attr_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet);\r
 +      //pthread_attr_setaffinity_np(&attr, sizeof(*cpuSet), cpuSet);\r
        // if (ret2) ret = ret2;\r
-       #endif\r
+ #endif\r
      }\r
 @@ -275,14 +275,12 @@ WRes Thread_Create_With_CpuSet(CThread *
      if (!ret)\r
@@ -37,7 +26,7 @@
    // ret2 =\r
 --- a/C/Threads.h
 +++ b/C/Threads.h
-@@ -20,6 +20,7 @@
+@@ -29,6 +29,7 @@ Z7_DIAGNOSTIC_IGNORE_END_RESERVED_MACRO_
  #endif\r
  \r
  #include <pthread.h>\r
@@ -45,15 +34,3 @@
  \r
  #endif\r
  \r
---- a/CPP/Windows/SystemInfo.cpp
-+++ b/CPP/Windows/SystemInfo.cpp
-@@ -36,9 +36,6 @@
- #endif\r
- */\r
- \r
--#ifdef MY_CPU_ARM_OR_ARM64\r
--#include <asm/hwcap.h>\r
--#endif\r
- #endif\r
- \r
- #ifdef __linux__\r