PoetryInCode/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

7zip: update to 23.01.

Browse Source
This commit is contained in:
Roberto Ricci 2023-08-06 20:15:25 +02:00 committed by Leah Neukirchen
parent 29d91e666b
commit ba352bb52a
3 changed files with 50 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
srcpkgs/7zip/patches/armv7.patch Normal file
View File

@ -0,0 +1,22 @@
https://gitlab.alpinelinux.org/alpine/aports/-/raw/da4780262417a9446b7d13fe9bb7e83c54edb53d/main/7zip/armv7.patch
we don't have neon on armv7
--
diff --git a/C/SwapBytes.c b/C/SwapBytes.c
index 0bfe95c..834fe4b 100755
--- a/C/SwapBytes.c
+++ b/C/SwapBytes.c
@@ -331,12 +331,12 @@ ShufBytes_256(void *items8, const void *lim8, const void *mask128_ptr)
// compile message "NEON intrinsics not available with the soft-float ABI"
#elif defined(MY_CPU_ARM_OR_ARM64) || \
- (defined(__ARM_ARCH) && (__ARM_ARCH >= 7))
+ (defined(__ARM_ARCH) && (__ARM_ARCH >= 8))
// #elif defined(MY_CPU_ARM64)
#if defined(__clang__) && (__clang_major__ >= 8) \
|| defined(__GNUC__) && (__GNUC__ >= 8)
- #if (defined(__ARM_ARCH) && (__ARM_ARCH >= 7)) \
+ #if (defined(__ARM_ARCH) && (__ARM_ARCH >= 8)) \
|| defined(MY_CPU_ARM64)
#define USE_SWAP_128
#endif

38
srcpkgs/7zip/patches/build_flags.patch
View File

@ -2,15 +2,17 @@ adapted from https://sources.debian.org/patches/7zip/22.01+dfsg-4/0001-Accept-De
and https://gitlab.alpinelinux.org/alpine/aports/-/raw/291a2b61d6e613fbe3ed057c1f2ee41fd2aea9ac/community/7zip/7-zip-flags.patch
--- a/CPP/7zip/7zip_gcc.mak
+++ b/CPP/7zip/7zip_gcc.mak
@@ -18,13 +18,13 @@
@@ -24,7 +24,7 @@
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 @@
# -save-temps
CFLAGS_BASE_LIST = -c
# CFLAGS_BASE_LIST = -S
-CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \
@ -18,39 +20,39 @@ and https://gitlab.alpinelinux.org/alpine/aports/-/raw/291a2b61d6e613fbe3ed057c1
-DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-fPIC
@@ -82,7 +82,7 @@
@@ -94,7 +94,7 @@
else
-LDFLAGS = $(LDFLAGS_STATIC)
+LDFLAGS = $(VOID_LDFLAGS) $(LDFLAGS_STATIC)
# -s is not required for clang, do we need it for GGC ???
# -s
# -s is not required for clang, do we need it for GCC ???
@@ -138,7 +138,7 @@
#-static -static-libgcc -static-libstdc++
@@ -149,7 +149,7 @@
-CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(CC_SHARED) -o $@
+CFLAGS = $(VOID_CFLAGS) $(VOID_CPPFLAGS) $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(CC_SHARED) -o $@
-CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) -o $@
+CFLAGS = $(VOID_CFLAGS) $(VOID_CPPFLAGS) $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) -o $@
ifdef IS_MINGW
@@ -179,7 +179,7 @@
@@ -190,7 +190,7 @@
#-Wno-invalid-offsetof
#-Wno-reorder
-CXXFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(CXXFLAGS_EXTRA) $(CC_SHARED) -o $@ $(CXX_WARN_FLAGS)
+CXXFLAGS = $(VOID_CXXFLAGS) $(VOID_CPPFLAGS) $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(CXXFLAGS_EXTRA) $(CC_SHARED) -o $@ $(CXX_WARN_FLAGS)
-CXXFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CXXFLAGS_EXTRA) $(CC_SHARED) $(CXX_WARN_FLAGS) $(CXX_STD_FLAGS) -o $@
+CXXFLAGS = $(VOID_CXXFLAGS) $(VOID_CPPFLAGS) $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CXXFLAGS_EXTRA) $(CC_SHARED) $(CXX_WARN_FLAGS) $(CXX_STD_FLAGS) -o $@
STATIC_TARGET=
ifdef COMPL_STATIC
@@ -192,7 +192,7 @@
$(O):
$(MY_MKDIR) $(O)
@@ -208,7 +208,7 @@
# -Wl,--print-gc-sections
-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)
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)

16
srcpkgs/7zip/template
View File

@ -1,14 +1,14 @@
# Template file for '7zip'
pkgname=7zip
version=22.01
revision=2
version=23.01
revision=1
short_desc="File archiver with a high compression ratio"
maintainer="Roberto Ricci <ricci@disroot.org>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://www.7-zip.org"
changelog="https://www.7-zip.org/history.txt"
distfiles="https://www.7-zip.org/a/7z${version//./}-src.tar.xz"
checksum=393098730c70042392af808917e765945dc2437dee7aae3cfcc4966eb920fbc5
checksum=356071007360e5a1824d9904993e8b2480b51b570e8c9faf7c0f58ebe4bf9f74
alternatives="
7z:7z:/usr/bin/7zip
7z:7za:/usr/bin/7zip
@ -16,12 +16,12 @@ alternatives="
if [ "$XBPS_TARGET_LIBC" = musl ]; then
# missing pthread_attr_setaffinity_np()
CFLAGS+="-D_7ZIP_AFFINITY_DISABLE"
CXXFLAGS+="-D_7ZIP_AFFINITY_DISABLE"
CFLAGS+=" -DZ7_AFFINITY_DISABLE"
CXXFLAGS+=" -DZ7_AFFINITY_DISABLE"
fi
do_build() {
cd "$wrksrc"/CPP/7zip/Bundles/Alone2
cd "${wrksrc}/CPP/7zip/Bundles/Alone2"
case "$XBPS_TARGET_MACHINE" in
aarch64*) _7z_makefile="../../cmpl_gcc_arm64.mak";;
@ -38,7 +38,7 @@ do_build() {
}
do_install() {
vbin "${wrksrc}/CPP/7zip/Bundles/Alone2/b/norar/7zz" "7zip"
vbin "${wrksrc}/CPP/7zip/Bundles/Alone2/b/norar/7zz" 7zip
vlicense "${wrksrc}/DOC/License.txt"
}
@ -52,7 +52,7 @@ do_install() {
7z:7zr:/usr/bin/7zip-unrar"
pkg_install() {
vbin "${wrksrc}/CPP/7zip/Bundles/Alone2/b/rar/7zz" "7zip-unrar"
vbin "${wrksrc}/CPP/7zip/Bundles/Alone2/b/rar/7zz" 7zip-unrar
vlicense "${wrksrc}/DOC/License.txt"
}
}