fix(main/7zip): enable 7z.so, 7zr, 7zCon.sfx, ARM assembly and RAR

termux-pacman-bot · termux-pacman-bot · commit a35d94d80ee6 · 2026-07-27T19:02:05.000Z
- License becomes "The 'GNU LGPL' with 'unRAR license restriction' for some code" https://www.7-zip.org/license.txt. Arch Linux builds 7zip this way; Debian and Alpine Linux do not - The x86 assembly is non-position-independent, so is not compatible with Android 5+. The ARM assembly works.
diff --git a/packages/7zip/build.sh b/packages/7zip/build.sh
@@ -1,10 +1,14 @@
 TERMUX_PKG_HOMEPAGE=https://www.7-zip.org
 TERMUX_PKG_DESCRIPTION="7-Zip file archiver with a high compression ratio"
 TERMUX_PKG_LICENSE="LGPL-2.1, BSD 3-Clause, BSD 2-Clause"
-TERMUX_PKG_LICENSE_FILE="DOC/License.txt, DOC/copying.txt"
+TERMUX_PKG_LICENSE_FILE="
+DOC/copying.txt
+DOC/License.txt
+DOC/unRarLicense.txt
+"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="26.02"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=(
 	"https://www.7-zip.org/a/7z${TERMUX_PKG_VERSION//./}-src.tar.xz"
 	"https://www.7-zip.org/a/7z${TERMUX_PKG_VERSION//./}-linux-arm.tar.xz" # for manual, arm is smallest
@@ -13,6 +17,7 @@ TERMUX_PKG_SHA256=(
 	cf967c98bca02a4b8b16375f441825a8e141362f14be1969bbec8e1ca0bff9dd
 	81b7f04b3528852fac10f5becf9f15870a5da4cb94fbcb8a138197eb937468bf
 )
+TERMUX_PKG_BUILD_DEPENDS="dos2unix"
 TERMUX_PKG_AUTO_UPDATE=false
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_CONFLICTS="p7zip"
@@ -27,29 +32,49 @@ termux_extract_src_archive() {
 	tar -xf "$file" -C "$TERMUX_PKG_SRCDIR"
 }
 
-termux_step_pre_configure() {
-	if [[ "$TERMUX_ARCH" == 'aarch64' ]]; then
-		CFLAGS+=' -march=armv8.1-a+crypto'
-		CXXFLAGS+=' -march=armv8.1-a+crypto'
+termux_step_post_get_source() {
+	# convert CRLF to LF like in libpluto package
+	if [[ "$TERMUX_ON_DEVICE_BUILD" == "false" ]]; then
+		DOS2UNIX="$TERMUX_PKG_TMPDIR/dos2unix"
+		(
+			. "$TERMUX_SCRIPTDIR/packages/dos2unix/build.sh"
+			. "$TERMUX_SCRIPTDIR/scripts/build/get_source/termux_unpack_src_archive.sh"
+			TERMUX_PKG_SRCDIR="$DOS2UNIX" termux_step_get_source
+		)
+		pushd "$DOS2UNIX"
+		make dos2unix
+		popd # DOS2UNIX
+		export PATH="$DOS2UNIX:$PATH"
 	fi
+
+	find "$TERMUX_PKG_SRCDIR" -type f -print0 | xargs -0 dos2unix
+}
+
+termux_step_pre_configure() {
 	# Remove executable perms from docs
 	chmod -x DOC/*.txt
 	# Remove -Werror to make build succeed
 	sed -i -e 's/-Werror//' CPP/7zip/7zip_gcc.mak
 }
 
 termux_step_make() {
+	local optim_args
+	case "$TERMUX_ARCH" in
+		x86_64)  optim_args='-f ../../cmpl_clang_x64.mak' ;;
+		i686)    optim_args='-f ../../cmpl_clang_x86.mak' ;;
+		arm)     optim_args='-f ../../cmpl_clang.mak PLATFORM=arm USE_ASM=1' ;;
+		aarch64) optim_args='-f ../../cmpl_clang_arm64.mak' ;;
+	esac
+
 	# from https://git.alpinelinux.org/aports/tree/community/7zip/APKBUILD?id=b4601c88f608662c75422311b7ca3c26fab4b1f4
-	# TODO: enable asm
-	# DISABLE_RAR: RAR codec is non-free
 	# -D_GNU_SOURCE: broken sched.h defines
 	local bin
-	for bin in Bundles/{Alone,Alone2} UI/Console; do
+	for bin in Bundles/{Format7zF,Alone,Alone7z,Alone2,SFXCon} UI/Console; do
 		make -C "CPP/7zip/$bin" \
 			CC="$CC $CFLAGS $LDFLAGS -D_GNU_SOURCE" \
 			CXX="$CXX $CXXFLAGS $LDFLAGS -D_GNU_SOURCE" \
-			DISABLE_RAR=1 \
-			--file ../../cmpl_clang.mak \
+			O=b/c \
+			$optim_args \
 			--jobs "$TERMUX_PKG_MAKE_PROCESSES"
 	done
 }
@@ -59,10 +84,17 @@ termux_step_make_install() {
 		-t "$TERMUX_PREFIX"/bin \
 		"$TERMUX_PKG_BUILDDIR"/CPP/7zip/UI/Console/b/c/7z \
 		"$TERMUX_PKG_BUILDDIR"/CPP/7zip/Bundles/Alone/b/c/7za \
+		"$TERMUX_PKG_BUILDDIR"/CPP/7zip/Bundles/Alone7z/b/c/7zr \
 		"$TERMUX_PKG_BUILDDIR"/CPP/7zip/Bundles/Alone2/b/c/7zz
+	install -Dm0755 \
+		"$TERMUX_PKG_BUILDDIR"/CPP/7zip/Bundles/SFXCon/b/c/7zCon \
+		"$TERMUX_PREFIX"/libexec/7zip/7zCon.sfx
+	install -Dm0755 \
+		-t "$TERMUX_PREFIX"/libexec/7zip \
+		"$TERMUX_PKG_BUILDDIR"/CPP/7zip/Bundles/Format7zF/b/c/7z.so
 	install -Dm0644 \
 		-t "$TERMUX_PREFIX"/share/doc/"$TERMUX_PKG_NAME" \
-		"$TERMUX_PKG_BUILDDIR"/DOC/{7zC,7zFormat,copying,License,lzma,Methods,readme,src-history}.txt
+		"$TERMUX_PKG_BUILDDIR"/DOC/{7zC,7zFormat,lzma,Methods,readme,src-history}.txt
 	tar -C "$TERMUX_PREFIX"/share/doc/"$TERMUX_PKG_NAME" \
 		-xvf "$TERMUX_PKG_CACHEDIR/$(basename "${TERMUX_PKG_SRCURL[1]}")" MANUAL
 	# Remove carriage returns from docs
diff --git a/packages/7zip/disable-asm-x86.patch b/packages/7zip/disable-asm-x86.patch
@@ -0,0 +1,26 @@
+The x86 ASM is not position-independent
+ld.lld: error: relocation R_386_32 cannot be used against symbol 'Reverse_Endian_Mask';
+recompile with -fPIC
+
+--- a/CPP/7zip/var_clang_x64.mak
++++ b/CPP/7zip/var_clang_x64.mak
+@@ -5,7 +5,7 @@ IS_X86=
+ IS_ARM64=
+ CROSS_COMPILE=
+ MY_ARCH=
+-USE_ASM=1
++USE_ASM=
+ CC=$(CROSS_COMPILE)clang
+ CXX=$(CROSS_COMPILE)clang++
+ USE_CLANG=1
+--- a/CPP/7zip/var_clang_x86.mak
++++ b/CPP/7zip/var_clang_x86.mak
+@@ -5,7 +5,7 @@ IS_X86=1
+ IS_ARM64=
+ CROSS_COMPILE=
+ MY_ARCH=-m32
+-USE_ASM=1
++USE_ASM=
+ CC=$(CROSS_COMPILE)clang
+ CXX=$(CROSS_COMPILE)clang++
+ USE_CLANG=1
diff --git a/packages/7zip/fix-hardcoded-paths.patch b/packages/7zip/fix-hardcoded-paths.patch
@@ -1,26 +1,38 @@
 --- a/CPP/7zip/UI/Console/Main.cpp
 +++ b/CPP/7zip/UI/Console/Main.cpp
 @@ -283,7 +283,7 @@ static void ShowProgInfo(CStdOutStream *so)
-     {
-       FString temp;
-       NDir::MyGetTempPath(temp);
--      if (!temp.IsEqualTo(STRING_PATH_SEPARATOR "tmp" STRING_PATH_SEPARATOR))
-+      if (!temp.IsEqualTo("@TERMUX_PREFIX@/tmp/"))
-         *so << " temp_path:" << temp;
-     }
-   }
+     {
+       FString temp;
+       NDir::MyGetTempPath(temp);
+-      if (!temp.IsEqualTo(STRING_PATH_SEPARATOR "tmp" STRING_PATH_SEPARATOR))
++      if (!temp.IsEqualTo("@TERMUX_PREFIX@/tmp/"))
+         *so << " temp_path:" << temp;
+     }
+   }
 --- a/CPP/Windows/FileDir.cpp
 +++ b/CPP/Windows/FileDir.cpp
 @@ -748,10 +748,10 @@ bool MyGetTempPath(FString &path)
-   #else  // !_WIN32
-   
-   // FIXME: improve that code
--  path = STRING_PATH_SEPARATOR "tmp";
-+  path = "@TERMUX_PREFIX@/tmp";
-   const char *s;
-   if (NFind::DoesDirExist_FollowLink(path))
--    s = STRING_PATH_SEPARATOR "tmp" STRING_PATH_SEPARATOR;
-+    s = "@TERMUX_PREFIX@/tmp/";
-   else
-     s = "." STRING_PATH_SEPARATOR;
-   path = s;
+   #else  // !_WIN32
+   
+   // FIXME: improve that code
+-  path = STRING_PATH_SEPARATOR "tmp";
++  path = "@TERMUX_PREFIX@/tmp";
+   const char *s;
+   if (NFind::DoesDirExist_FollowLink(path))
+-    s = STRING_PATH_SEPARATOR "tmp" STRING_PATH_SEPARATOR;
++    s = "@TERMUX_PREFIX@/tmp/";
+   else
+     s = "." STRING_PATH_SEPARATOR;
+   path = s;
+--- a/CPP/7zip/UI/Common/ArchiveCommandLine.cpp
++++ b/CPP/7zip/UI/Common/ArchiveCommandLine.cpp
+@@ -1894,8 +1894,7 @@ FString GetModuleDirPrefix()
+   FString s;
+
+   s = fas2fs(g_ModuleDirPrefix);
+-  if (s.IsEmpty())
+-    s = FTEXT(".") FSTRING_PATH_SEPARATOR;
++  s = FTEXT("@TERMUX_PREFIX@/libexec/7zip") FSTRING_PATH_SEPARATOR;
+   return s;
+   /*
+   setenv("_7ZIP_HOME_DIR", "/test/", 0);
diff --git a/packages/7zip/no-timespec_get.patch b/packages/7zip/no-timespec_get.patch
@@ -1,11 +1,11 @@
 --- a/CPP/Windows/TimeUtils.cpp
 +++ b/CPP/Windows/TimeUtils.cpp
 @@ -260,7 +260,7 @@
-       Cygwin 2.9, mingw, MSVC 14, Android 9.0.
-   Android NDK defines TIME_UTC but doesn't have the timespec_get().
- */
--#if defined(TIME_UTC) && !defined(__ANDROID__)
-+#if defined(TIME_UTC) && (!defined __ANDROID_API__ || __ANDROID_API__ >= 29)
- #define ZIP7_USE_timespec_get
- // #pragma message("ZIP7_USE_timespec_get")
- #elif defined(CLOCK_REALTIME)
+       Cygwin 2.9, mingw, MSVC 14, Android 9.0.
+   Android NDK defines TIME_UTC but doesn't have the timespec_get().
+ */
+-#if defined(TIME_UTC) && !defined(__ANDROID__)
++#if defined(TIME_UTC) && (!defined __ANDROID_API__ || __ANDROID_API__ >= 29)
+ #define ZIP7_USE_timespec_get
+ // #pragma message("ZIP7_USE_timespec_get")
+ #elif defined(CLOCK_REALTIME)
