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>
This commit is contained in:
parent
ce4b345b7b
commit
a9f58dddb7
|
@ -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
|
||||
|
||||
|
|
|
@ -9,12 +9,12 @@
|
|||
endif
|
||||
|
||||
# for object file
|
||||
@@ -32,7 +32,7 @@ endif
|
||||
# -save-temps
|
||||
CFLAGS_BASE_LIST = -c
|
||||
@@ -50,7 +50,7 @@ endif
|
||||
endif
|
||||
|
||||
# CFLAGS_BASE_LIST = -S
|
||||
-CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \
|
||||
+CFLAGS_BASE = $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) -D_GNU_SOURCE \
|
||||
-DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
|
||||
$(CFLAGS_DEBUG) -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
|
||||
-fPIC
|
||||
|
||||
|
|
|
@ -1,14 +1,3 @@
|
|||
--- a/C/CpuArch.c
|
||||
+++ b/C/CpuArch.c
|
||||
@@ -766,8 +766,6 @@ BoolInt CPU_IsSupported_AES (void) { ret
|
||||
|
||||
#ifdef USE_HWCAP
|
||||
|
||||
-#include <asm/hwcap.h>
|
||||
-
|
||||
#define MY_HWCAP_CHECK_FUNC_2(name1, name2) \
|
||||
BoolInt CPU_IsSupported_ ## name1() { return (getauxval(AT_HWCAP) & (HWCAP_ ## name2)) ? 1 : 0; }
|
||||
|
||||
--- a/C/Threads.c
|
||||
+++ b/C/Threads.c
|
||||
@@ -265,7 +265,7 @@ WRes Thread_Create_With_CpuSet(CThread *
|
||||
|
@ -37,7 +26,7 @@
|
|||
// ret2 =
|
||||
--- a/C/Threads.h
|
||||
+++ b/C/Threads.h
|
||||
@@ -20,6 +20,7 @@
|
||||
@@ -29,6 +29,7 @@ Z7_DIAGNOSTIC_IGNORE_END_RESERVED_MACRO_
|
||||
#endif
|
||||
|
||||
#include <pthread.h>
|
||||
|
@ -45,15 +34,3 @@
|
|||
|
||||
#endif
|
||||
|
||||
--- a/CPP/Windows/SystemInfo.cpp
|
||||
+++ b/CPP/Windows/SystemInfo.cpp
|
||||
@@ -36,9 +36,6 @@
|
||||
#endif
|
||||
*/
|
||||
|
||||
-#ifdef MY_CPU_ARM_OR_ARM64
|
||||
-#include <asm/hwcap.h>
|
||||
-#endif
|
||||
#endif
|
||||
|
||||
#ifdef __linux__
|
||||
|
|
Loading…
Reference in New Issue