Merge pull request #130 from SwimmingTiger/p7zip

jiegec · web-flow · commit 019c913efdcc · 2025-10-04T16:15:34.000+02:00
add p7zip (7z/7za)
diff --git a/.github/workflows/hnp.yml b/.github/workflows/hnp.yml
@@ -19,20 +19,21 @@ jobs:
       - name: Update Apt Cache
         run: sudo apt update
 
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          # this might remove tools that are actually needed,
-          # if set to "true" but frees about 6 GB
-          tool-cache: true
-          # all of these default to true, but feel free to set to
-          # "false" if necessary for your workflow
-          android: true
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: true
+      # Disabled due to excessive time consumption and no clear benefit
+      #- name: Free Disk Space (Ubuntu)
+      #  uses: jlumbroso/free-disk-space@main
+      #  with:
+      #    # this might remove tools that are actually needed,
+      #    # if set to "true" but frees about 6 GB
+      #    tool-cache: true
+      #    # all of these default to true, but feel free to set to
+      #    # "false" if necessary for your workflow
+      #    android: true
+      #    dotnet: true
+      #    haskell: true
+      #    large-packages: true
+      #    docker-images: true
+      #    swap-storage: true
 
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/build-hnp/Makefile b/build-hnp/Makefile
@@ -69,7 +69,8 @@ PKGS=gettext \
 	ffmpeg \
 	util-linux \
 	nano \
-	less
+	less \
+	p7zip
 else ifeq ($(OHOS_ARCH),x86_64)
 PKGS=gettext \
 	bash \
@@ -140,7 +141,8 @@ PKGS=gettext \
 	ffmpeg \
 	util-linux \
 	nano \
-	less
+	less \
+	p7zip
 else
 	echo "Unsupported OHOS_ARCH=$(OHOS_ARCH)"
 	exit 1
diff --git a/build-hnp/busybox/Makefile b/build-hnp/busybox/Makefile
@@ -32,4 +32,4 @@ all: download/busybox-1.37.0.tar.bz2
 
 download/busybox-1.37.0.tar.bz2:
 	mkdir -p download
-	cd download && wget https://busybox.net/downloads/busybox-1.37.0.tar.bz2
+	cd download && $(WGET) https://mirrors.slackware.com/slackware/slackware64-current/source/a/mkinitrd/busybox-1.37.0.tar.bz2
diff --git a/build-hnp/coremark/Makefile b/build-hnp/coremark/Makefile
@@ -10,4 +10,4 @@ all: download/main.zip
 
 download/main.zip:
 	mkdir -p download
-	cd download && wget https://github.com/eembc/coremark/archive/refs/heads/main.zip
+	cd download && $(WGET) https://github.com/eembc/coremark/archive/refs/heads/main.zip
diff --git a/build-hnp/ffmpeg/Makefile b/build-hnp/ffmpeg/Makefile
@@ -32,4 +32,4 @@ all: download/ffmpeg-8.0.tar.xz ohos_config.sh
 
 download/ffmpeg-8.0.tar.xz:
 	mkdir -p download
-	cd download && wget -O ffmpeg-8.0.tar.xz https://ffmpeg.org/releases/ffmpeg-8.0.tar.xz
+	cd download && $(WGET) -O ffmpeg-8.0.tar.xz https://ffmpeg.org/releases/ffmpeg-8.0.tar.xz
diff --git a/build-hnp/gcc/Makefile b/build-hnp/gcc/Makefile
@@ -18,4 +18,4 @@ all: download/gcc-15.1.0.tar.xz
 
 download/gcc-15.1.0.tar.xz:
 	mkdir -p download
-	cd download && wget https://mirrors.tuna.tsinghua.edu.cn/gnu/gcc/gcc-15.1.0/gcc-15.1.0.tar.xz
+	cd download && $(WGET) https://mirrors.tuna.tsinghua.edu.cn/gnu/gcc/gcc-15.1.0/gcc-15.1.0.tar.xz
diff --git a/build-hnp/git/Makefile b/build-hnp/git/Makefile
@@ -1,3 +1,5 @@
+include ../utils/Makefrag
+
 all: download/v2.49.0.tar.gz
 	rm -rf temp build
 	mkdir -p temp build
@@ -19,4 +21,4 @@ all: download/v2.49.0.tar.gz
 
 download/v2.49.0.tar.gz:
 	mkdir -p download
-	cd download && wget https://github.com/git/git/archive/refs/tags/v2.49.0.tar.gz
+	cd download && $(WGET) https://github.com/git/git/archive/refs/tags/v2.49.0.tar.gz
diff --git a/build-hnp/hdc/Makefile b/build-hnp/hdc/Makefile
@@ -15,8 +15,8 @@ all: download/hdc.zip download/securec.zip CMakeLists.txt
 
 download/hdc.zip:
 	mkdir -p download
-	cd download && wget -O hdc.zip https://gitee.com/openharmony/developtools_hdc/repository/archive/OpenHarmony-v5.0.1-Release.zip
+	cd download && $(WGET) -O hdc.zip https://gitee.com/openharmony/developtools_hdc/repository/archive/OpenHarmony-v5.0.1-Release.zip
 
 download/securec.zip:
 	mkdir -p download
-	cd download && wget -O securec.zip https://gitee.com/openharmony/third_party_bounds_checking_function/repository/archive/OpenHarmony-5.0.1-Release.zip
+	cd download && $(WGET) -O securec.zip https://gitee.com/openharmony/third_party_bounds_checking_function/repository/archive/OpenHarmony-5.0.1-Release.zip
diff --git a/build-hnp/kbd/Makefile b/build-hnp/kbd/Makefile
@@ -13,4 +13,4 @@ all: download/kbd-2.8.0.tar.xz
 
 download/kbd-2.8.0.tar.xz:
 	mkdir -p download
-	cd download && wget https://www.kernel.org/pub/linux/utils/kbd/kbd-2.8.0.tar.xz
+	cd download && $(WGET) https://www.kernel.org/pub/linux/utils/kbd/kbd-2.8.0.tar.xz
diff --git a/build-hnp/ncnn/Makefile b/build-hnp/ncnn/Makefile
@@ -17,4 +17,4 @@ all: download/ncnn-20250503-full-source.zip
 
 download/ncnn-20250503-full-source.zip:
 	mkdir -p download
-	cd download && wget https://github.com/Tencent/ncnn/releases/download/20250503/ncnn-20250503-full-source.zip
+	cd download && $(WGET) https://github.com/Tencent/ncnn/releases/download/20250503/ncnn-20250503-full-source.zip
diff --git a/build-hnp/ncurses/Makefile b/build-hnp/ncurses/Makefile
@@ -17,4 +17,4 @@ all: download/ncurses-6.5.tar.gz
 
 download/ncurses-6.5.tar.gz:
 	mkdir -p download
-	cd download && wget https://mirrors.tuna.tsinghua.edu.cn/gnu/ncurses/ncurses-6.5.tar.gz
+	cd download && $(WGET) https://mirrors.tuna.tsinghua.edu.cn/gnu/ncurses/ncurses-6.5.tar.gz
diff --git a/build-hnp/openssh/Makefile b/build-hnp/openssh/Makefile
@@ -1,3 +1,4 @@
+include ../utils/Makefrag
 
 all: download/V_10_0_P2.tar.gz
 	rm -rf temp build
@@ -11,4 +12,4 @@ all: download/V_10_0_P2.tar.gz
 
 download/V_10_0_P2.tar.gz:
 	mkdir -p download
-	cd download && wget https://github.com/openssh/openssh-portable/archive/refs/tags/V_10_0_P2.tar.gz
+	cd download && $(WGET) https://github.com/openssh/openssh-portable/archive/refs/tags/V_10_0_P2.tar.gz
diff --git a/build-hnp/openssl/Makefile b/build-hnp/openssl/Makefile
@@ -1,3 +1,5 @@
+include ../utils/Makefrag
+
 all: download/openssl-3.5.0.tar.gz
 	rm -rf temp build
 	mkdir -p temp build/bin
@@ -13,4 +15,4 @@ all: download/openssl-3.5.0.tar.gz
 
 download/openssl-3.5.0.tar.gz:
 	mkdir -p download
-	cd download && wget https://github.com/openssl/openssl/releases/download/openssl-3.5.0/openssl-3.5.0.tar.gz
+	cd download && $(WGET) https://github.com/openssl/openssl/releases/download/openssl-3.5.0/openssl-3.5.0.tar.gz
diff --git a/build-hnp/p7zip/0001-fix-ohos-build.patch b/build-hnp/p7zip/0001-fix-ohos-build.patch
@@ -0,0 +1,67 @@
+diff --git a/C/hashes/hash.h b/C/hashes/hash.h
+index 3abf275..274b8c4 100644
+--- a/C/hashes/hash.h
++++ b/C/hashes/hash.h
+@@ -42,6 +42,8 @@
+ 
+ #include "../7zTypes.h"
+ 
++#ifndef __MUSL__
++
+ #ifndef _UINT32_T_DECLARED
+ typedef UInt32 uint32_t;
+ #define _UINT32_T_DECLARED
+@@ -52,7 +54,11 @@ typedef UInt64 uint64_t;
+ #define _UINT64_T_DECLARED
+ #endif
+ 
+-//#include <stdint.h>
++#else
++
++#include <stdint.h>
++
++#endif // __MUSL__
+ 
+ #ifndef min
+ #define min(a,b) (((a)>(b))?(b):(a))
+diff --git a/CPP/myWindows/config.h b/CPP/myWindows/config.h
+index 497d197..ba8dfa9 100644
+--- a/CPP/myWindows/config.h
++++ b/CPP/myWindows/config.h
+@@ -38,7 +38,7 @@
+ 		
+   
+   
+-  #if !defined(ENV_BEOS) && !defined(ANDROID_NDK)
++  #if !defined(ENV_BEOS) && !defined(ANDROID_NDK) && !defined(__MUSL__)
+ 
+     #define ENV_HAVE_GETPASS
+ 
+diff --git a/install.sh b/install.sh
+index bf13aa0..02e3124 100755
+--- a/install.sh
++++ b/install.sh
+@@ -10,7 +10,7 @@ installShared()
+     chmod 755 "${DEST_DIR}${DEST_SHARE}/${prg}"
+     strip     "${DEST_DIR}${DEST_SHARE}/${prg}"
+     echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/${prg}"
+-    echo "\"${DEST_SHARE}/${prg}\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/${prg}"
++    echo "\"\$(dirname \"\$(dirname \"\$(realpath \"\$0\")\")\")/${DEST_SHARE}/${prg}\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/${prg}"
+     chmod 755 "${DEST_DIR}${DEST_BIN}/${prg}"
+   fi
+ }
+diff --git a/makefile.machine b/makefile.machine
+index a89b568..6d929de 100644
+--- a/makefile.machine
++++ b/makefile.machine
+@@ -11,8 +11,8 @@ ALLFLAGS=${OPTFLAGS} -pipe \
+ 	-D_7ZIP_LARGE_PAGES \
+ 	$(LOCAL_FLAGS)
+ 
+-CXX=g++
+-CC=gcc
++#CXX=g++
++#CC=gcc
+ CC_SHARED=-fPIC
+ LINK_SHARED=-fPIC -shared
+ 
diff --git a/build-hnp/p7zip/Makefile b/build-hnp/p7zip/Makefile
@@ -0,0 +1,16 @@
+include ../utils/Makefrag
+
+all: download/v17.05.tar.gz
+	rm -rf temp build
+	mkdir -p temp build
+	cd temp && tar vxf ../download/v17.05.tar.gz
+	#cd temp/p7zip-17.05/ && git init . && git add --all && git commit -m "init" # help to update 0001-fix-ohos-build.patch with git diff
+	cd temp/p7zip-17.05/ && patch -Np1 < ../../0001-fix-ohos-build.patch
+	cd temp/p7zip-17.05/ && make -j $(shell nproc) all2
+	mkdir -p ../sysroot
+	cd temp/p7zip-17.05/ && ./install.sh bin lib/p7zip man doc ../../build/
+	cp -rv build/bin build/lib ../sysroot/ | tee file.lst
+
+download/v17.05.tar.gz:
+	mkdir -p download
+	cd download && wget -O v17.05.tar.gz https://github.com/p7zip-project/p7zip/archive/refs/tags/v17.05.tar.gz
diff --git a/build-hnp/python/Makefile b/build-hnp/python/Makefile
@@ -26,4 +26,4 @@ all: download/Python-3.13.5.tar.xz
 
 download/Python-3.13.5.tar.xz:
 	mkdir -p download
-	cd download && wget https://www.python.org/ftp/python/3.13.5/Python-3.13.5.tar.xz
+	cd download && $(WGET) https://www.python.org/ftp/python/3.13.5/Python-3.13.5.tar.xz
diff --git a/build-hnp/shaderc/Makefile b/build-hnp/shaderc/Makefile
@@ -34,12 +34,12 @@ subproject: download/$(SPIRVTools_FILE) download/$(SPIRVHeaders_FILE) download/$
 
 download/$(SPIRVTools_FILE):
 	mkdir -p download
-	cd download && wget -O $(SPIRVTools_FILE) --retry-connrefused --read-timeout=20 --timeout=15 $(SPIRVTools_URL)
+	cd download && $(WGET) -O $(SPIRVTools_FILE) $(SPIRVTools_URL)
 
 download/$(SPIRVHeaders_FILE):
 	mkdir -p download
-	cd download && wget -O $(SPIRVHeaders_FILE) --retry-connrefused --read-timeout=20 --timeout=15 $(SPIRVHeaders_URL)
+	cd download && $(WGET) -O $(SPIRVHeaders_FILE) $(SPIRVHeaders_URL)
 
 download/$(glslang_FILE):
 	mkdir -p download
-	cd download && wget -O $(glslang_FILE) --retry-connrefused --read-timeout=20 --timeout=15 $(glslang_URL)
+	cd download && $(WGET) -O $(glslang_FILE) $(glslang_URL)
diff --git a/build-hnp/sl/Makefile b/build-hnp/sl/Makefile
@@ -1,3 +1,5 @@
+include ../utils/Makefrag
+
 all: download/5.02.tar.gz
 	rm -rf temp build
 	mkdir -p temp build
@@ -9,4 +11,4 @@ all: download/5.02.tar.gz
 
 download/5.02.tar.gz:
 	mkdir -p download
-	cd download && wget https://github.com/mtoyoda/sl/archive/refs/tags/5.02.tar.gz
+	cd download && $(WGET) https://github.com/mtoyoda/sl/archive/refs/tags/5.02.tar.gz
diff --git a/build-hnp/stream/Makefile b/build-hnp/stream/Makefile
@@ -1,3 +1,5 @@
+include ../utils/Makefrag
+
 all: download/6703f7504a38a8da96b353cadafa64d3c2d7a2d3.zip download/3b92a251022474a293cefc1291bc4fe7b78b62e7.zip
 	rm -rf temp build
 	mkdir -p temp build/bin
@@ -17,8 +19,8 @@ all: download/6703f7504a38a8da96b353cadafa64d3c2d7a2d3.zip download/3b92a2510224
 
 download/6703f7504a38a8da96b353cadafa64d3c2d7a2d3.zip:
 	mkdir -p download
-	cd download && wget https://github.com/jeffhammond/STREAM/archive/6703f7504a38a8da96b353cadafa64d3c2d7a2d3.zip
+	cd download && $(WGET) https://github.com/jeffhammond/STREAM/archive/6703f7504a38a8da96b353cadafa64d3c2d7a2d3.zip
 
 download/3b92a251022474a293cefc1291bc4fe7b78b62e7.zip:
 	mkdir -p download
-	cd download && wget https://github.com/jlinford/stream/archive/3b92a251022474a293cefc1291bc4fe7b78b62e7.zip
+	cd download && $(WGET) https://github.com/jlinford/stream/archive/3b92a251022474a293cefc1291bc4fe7b78b62e7.zip
diff --git a/build-hnp/talloc/Makefile b/build-hnp/talloc/Makefile
@@ -19,4 +19,4 @@ all: download/talloc-2.4.3.tar.gz
 
 download/talloc-2.4.3.tar.gz:
 	mkdir -p download
-	cd download && wget https://www.samba.org/ftp/talloc/talloc-2.4.3.tar.gz
+	cd download && $(WGET) https://www.samba.org/ftp/talloc/talloc-2.4.3.tar.gz
diff --git a/build-hnp/tree/Makefile b/build-hnp/tree/Makefile
@@ -1,3 +1,5 @@
+include ../utils/Makefrag
+
 all: download/2.2.1.tar.gz
 	rm -rf temp build
 	mkdir -p temp build
@@ -9,4 +11,4 @@ all: download/2.2.1.tar.gz
 
 download/2.2.1.tar.gz:
 	mkdir -p download
-	cd download && wget https://github.com/Old-Man-Programmer/tree/archive/refs/tags/2.2.1.tar.gz
+	cd download && $(WGET) https://github.com/Old-Man-Programmer/tree/archive/refs/tags/2.2.1.tar.gz
diff --git a/build-hnp/utils/Makefrag b/build-hnp/utils/Makefrag
@@ -32,6 +32,9 @@ export CXXFLAGS := -I$(shell pwd)/../sysroot/include -O2
 export LDFLAGS := -L$(shell pwd)/../sysroot/lib
 export PREFIX := /data/app/base.org/base_1.0
 
+# wget with retry options
+WGET = wget --retry-connrefused --read-timeout=20 --timeout=15
+
 # default GNU mirror, allow to override
 GNU_MIRROR ?= https://ftpmirror.gnu.org
 
@@ -57,7 +60,7 @@ all: download/$(SOURCE_FILE)
 
 download/$(SOURCE_FILE):
 	mkdir -p download
-	cd download && wget -O $(SOURCE_FILE) --retry-connrefused --read-timeout=20 --timeout=15 $(SOURCE_URL)
+	cd download && $(WGET) -O $(SOURCE_FILE) $(SOURCE_URL)
 endef
 
 define define_autotools_package
diff --git a/build-hnp/vim/Makefile b/build-hnp/vim/Makefile
@@ -13,4 +13,4 @@ all: download/v9.1.1436.tar.gz
 
 download/v9.1.1436.tar.gz:
 	mkdir -p download
-	cd download && wget https://github.com/vim/vim/archive/refs/tags/v9.1.1436.tar.gz
+	cd download && $(WGET) https://github.com/vim/vim/archive/refs/tags/v9.1.1436.tar.gz
diff --git a/build-linux.sh b/build-linux.sh
@@ -24,8 +24,11 @@ export PATH=$TOOL_HOME/tool/node/bin:$PATH
 export OHOS_ARCH=aarch64
 export OHOS_ABI=arm64-v8a
 
+# wget with retry options
+WGET="wget --retry-connrefused --read-timeout=20 --timeout=15"
+
 prepare_arkuix() {
-	wget https://repo.huaweicloud.com/arkui-crossplatform/sdk/${ARKUIX_VERSION}/linux/arkui-x-linux-x64-${ARKUIX_VERSION}-Release.zip -c -O ${PROJ_BASE_HOME}/arkuix-sdk.zip
+	$WGET https://repo.huaweicloud.com/arkui-crossplatform/sdk/${ARKUIX_VERSION}/linux/arkui-x-linux-x64-${ARKUIX_VERSION}-Release.zip -c -O ${PROJ_BASE_HOME}/arkuix-sdk.zip
 	unzip -o ${PROJ_BASE_HOME}/arkuix-sdk.zip
 	# set arkui-x licenses approved
 	pushd ${PROJ_BASE_HOME}/arkui-x
