diff options
| author | psykose <alice@ayaya.dev> | 2023-06-29 04:04:23 +0000 |
|---|---|---|
| committer | alice <alice@ayaya.dev> | 2023-06-30 11:20:19 +0000 |
| commit | a2a071e5365bbbad41afa0fc51a973fc5d7e14e0 (patch) | |
| tree | 64e1a25f9993991739137d6f0503cafb52d68d32 /main | |
| parent | 7976b9271d540cd5989ea124e5b87b2ba3bf9a01 (diff) | |
| download | aports-a2a071e5365bbbad41afa0fc51a973fc5d7e14e0.zip | |
main/7zip: upgrade to 23.01
Diffstat (limited to 'main')
| -rw-r--r-- | main/7zip/7-zip-flags.patch | 45 | ||||
| -rw-r--r-- | main/7zip/APKBUILD | 8 |
2 files changed, 37 insertions, 16 deletions
diff --git a/main/7zip/7-zip-flags.patch b/main/7zip/7-zip-flags.patch index 963037ccd99..dea4c07ec31 100644 --- a/main/7zip/7-zip-flags.patch +++ b/main/7zip/7-zip-flags.patch @@ -1,15 +1,18 @@ -diff -ru a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak ---- a/CPP/7zip/7zip_gcc.mak 2021-11-20 04:00:00.000000000 -0500 -+++ b/CPP/7zip/7zip_gcc.mak 2021-12-16 11:01:16.236763027 -0500 -@@ -14,13 +14,13 @@ +diff --git a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak +index a8eb6e3..7a16e9e 100755 +--- a/CPP/7zip/7zip_gcc.mak ++++ b/CPP/7zip/7zip_gcc.mak +@@ -24,7 +24,7 @@ PROGPATH_STATIC = $(O)/$(PROG)s ifneq ($(CC), xlc)
--CFLAGS_WARN_WALL = -Wall -Werror -Wextra
+-CFLAGS_WARN_WALL = -Werror -Wall -Wextra
+CFLAGS_WARN_WALL = -Wall -Wextra
endif
# for object file
+@@ -32,7 +32,7 @@ endif + # -save-temps
CFLAGS_BASE_LIST = -c
# CFLAGS_BASE_LIST = -S
-CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \
@@ -17,12 +20,30 @@ diff -ru a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak -DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-fPIC
-@@ -162,7 +162,7 @@ - $(O):
- $(MY_MKDIR) $(O)
+@@ -149,7 +149,7 @@ endif --LFLAGS_ALL = -s $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
-+LFLAGS_ALL = $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
- $(PROGPATH): $(OBJS)
- $(CXX) -o $(PROGPATH) $(LFLAGS_ALL)
+
+
+-CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) -o $@
++CFLAGS += $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) -o $@
+
+
+ ifdef IS_MINGW
+@@ -208,7 +208,7 @@ $(O): + # -Wl,--print-gc-sections
+
+ ifneq ($(CC), $(CROSS_COMPILE)clang)
+-LFLAGS_STRIP = -s
++LFLAGS_STRIP =
+ endif
+
+ LFLAGS_ALL = $(LFLAGS_STRIP) $(MY_ARCH_2) $(LDFLAGS) $(FLAGS_FLTO) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
+@@ -1285,7 +1285,7 @@ predef_cc: + $(CC) $(CFLAGS) -E $(SHOW_PREDEF) ../../../../C/CpuArch.c > predef_cc_log
+ # $(CC) $(CFLAGS) -E -dM - < /dev/null
+ predef_cxx:
+- $(CXX) $(CFLAGS) -E $(SHOW_PREDEF) ../../../Common/CrcReg.cpp > predef_cxx_log
++ $(CXX) $(CXXFLAGS) -E $(SHOW_PREDEF) ../../../Common/CrcReg.cpp > predef_cxx_log
+
+ predef: predef_cc predef_cxx
diff --git a/main/7zip/APKBUILD b/main/7zip/APKBUILD index 31d4dbab644..021c8e6f0fa 100644 --- a/main/7zip/APKBUILD +++ b/main/7zip/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Alex Xu (Hello71) <alex_y_xu@yahoo.ca> pkgname=7zip -pkgver=22.01 +pkgver=23.01 _pkgver=${pkgver//./} -pkgrel=5 +pkgrel=0 pkgdesc="File archiver with a high compression ratio" url="https://7-zip.org/" arch="all" @@ -47,7 +47,7 @@ package() { } sha512sums=" -3f391b1bd65a0654eb5b31b50f1d400f0ec38ab191d88e15849a6e4d164b7bf2ce4a6d70ec8b6e27bde1b83bb2d45b65c03129499334669e05ee025784be455a 7z2201-src.tar.xz -1b6928f62f62e27cc948a0c1fe44c085a2e49f85e5a14bef186c613335ed67ccc63649162cef55ab4431e4fec70be5bd9d61f4c76bf702dd9c2c08cd1993e7be 7-zip-flags.patch +e39f660c023aa65e55388be225b5591fe2a5c9138693f3c9107e2eb4ce97fafde118d3375e01ada99d29de9633f56221b5b3d640c982178884670cd84c8aa986 7z2301-src.tar.xz +dfecb69861d00ee47311d83930adf80321b3c95ae01ce325677bde7aee6aa880a1979b0aa2909d9acb7a88ff31f910ac545ac218a0b5fd9e1270df2276b46d44 7-zip-flags.patch c652a87ad95f61901820adb61f3d1ceacedcb8aeaf9e89b2b728b7372eff67d9669eb363d5b2d2fb848ff2d8c5a727134fe13cc77d1215df7b2d32fe87711ebf 7-zip-musl.patch " |