Skip to content

Commit 788c046

Browse files
authored
Merge pull request #140 from KatyushaScarlet/add-7zip
Add 7zip (7zz)
2 parents 640e560 + 52a0a84 commit 788c046

3 files changed

Lines changed: 43 additions & 2 deletions

File tree

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
--- a/var_clang.mak 2025-08-03 19:14:59.000000000 +0800
2+
+++ b/var_clang.mak 2025-12-04 03:04:17.631340600 +0800
3+
@@ -6,6 +6,6 @@
4+
CROSS_COMPILE=
5+
MY_ARCH=
6+
USE_ASM=
7+
-CC=$(CROSS_COMPILE)clang
8+
-CXX=$(CROSS_COMPILE)clang++
9+
+# CC=$(CROSS_COMPILE)clang
10+
+# CXX=$(CROSS_COMPILE)clang++
11+
USE_CLANG=1
12+
13+
--- a/warn_clang.mak 2025-08-03 19:14:59.000000000 +0800
14+
+++ b/warn_clang.mak 2025-12-04 23:38:30.901766100 +0800
15+
@@ -1,3 +1,3 @@
16+
-CFLAGS_WARN = -Weverything -Wfatal-errors
17+
+CFLAGS_WARN = -Wfatal-errors
18+
# CXX_STD_FLAGS = -std=c++11
19+
# CXX_STD_FLAGS =

build-hnp/7zip/Makefile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
include ../utils/Makefrag
2+
3+
all: download/25.01.tar.gz
4+
rm -rf temp build
5+
mkdir -p temp build
6+
cd temp && tar vxf ../download/25.01.tar.gz
7+
8+
# patch
9+
cd temp/7zip-25.01/CPP/7zip && patch -Np1 < ../../../../0001-fix-ohos-build.patch
10+
11+
# build
12+
cd temp/7zip-25.01/CPP/7zip/Bundles/Alone2 && make -f ../../cmpl_clang.mak -j $(shell nproc)
13+
14+
# install
15+
mkdir -p ../sysroot
16+
install -v -Dm755 temp/7zip-25.01/CPP/7zip/Bundles/Alone2/b/c/7zz ../sysroot/bin/7zz
17+
18+
download/25.01.tar.gz:
19+
mkdir -p download
20+
cd download && wget -O 25.01.tar.gz https://github.com/ip7z/7zip/archive/refs/tags/25.01.tar.gz

build-hnp/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ PKGS=gettext \
7070
util-linux \
7171
nano \
7272
less \
73-
p7zip
73+
p7zip \
74+
7zip
7475
else ifeq ($(OHOS_ARCH),x86_64)
7576
PKGS=gettext \
7677
bash \
@@ -142,7 +143,8 @@ PKGS=gettext \
142143
util-linux \
143144
nano \
144145
less \
145-
p7zip
146+
p7zip \
147+
7zip
146148
else
147149
echo "Unsupported OHOS_ARCH=$(OHOS_ARCH)"
148150
exit 1

0 commit comments

Comments
 (0)