jzy/zerotier-magisk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sadly zerotier make-linux.mk does not support armv7; update service.sh

Browse Source
This commit is contained in:
eventlOwOp
2024-05-11 14:03:58 +08:00
parent c10a31216f
commit d105f81a9d
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
+20 -20
View File
@@ -70,30 +70,30 @@ jobs:
cd magisk
zip -q -r ../zerotier-magisk-aarch64.zip .
- name: Build for arm
run: |
PATH=`pwd`/android-ndk-$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
PATH=`pwd`/libnatpmp:$PATH
NDK_ROOT=`pwd`/android-ndk-$ndk/toolchains/llvm/prebuilt/linux-x86_64
# - name: Build for arm
# run: |
# PATH=`pwd`/android-ndk-$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
# PATH=`pwd`/libnatpmp:$PATH
# NDK_ROOT=`pwd`/android-ndk-$ndk/toolchains/llvm/prebuilt/linux-x86_64
CC=armv7a-linux-androideabi$api_version-clang
CXX=armv7a-linux-androideabi$api_version-clang++
# CC=armv7a-linux-androideabi$api_version-clang
# CXX=armv7a-linux-androideabi$api_version-clang++
cd libnatpmp
make clean
make CC=$CC natpmpc-shared
cd ..
# cd libnatpmp
# make clean
# make CC=$CC natpmpc-shared
# cd ..
cd ZeroTierOne
make clean
sed -i "s/armv7ve/armv7a/g" make-linux.mk
make -j $(nproc) ZT_DEBUG=0 ZT_SSO_SUPPORTED=0 CC=$CC CXX=$CXX LDFLAGS="-L../libnatpmp" DEFS="-I../libnatpmp -D__GLIBC__=0"
cd ..
# cd ZeroTierOne
# make clean
# sed -i "s/armv7ve/armv7a/g" make-linux.mk
# make -j $(nproc) ZT_DEBUG=0 ZT_SSO_SUPPORTED=0 CC=$CC CXX=$CXX LDFLAGS="-L../libnatpmp" DEFS="-I../libnatpmp -D__GLIBC__=0"
# cd ..
cp ZeroTierOne/zerotier-one magisk/zerotier/
cp $NDK_ROOT/sysroot/usr/lib/arm-linux-android/libc++_shared.so magisk/zerotier/lib
cd magisk
zip -q -r ../zerotier-magisk-arm.zip .
# cp ZeroTierOne/zerotier-one magisk/zerotier/
# cp $NDK_ROOT/sysroot/usr/lib/arm-linux-android/libc++_shared.so magisk/zerotier/lib
# cd magisk
# zip -q -r ../zerotier-magisk-arm.zip .
- name: Debugging with tmate
uses: mxschmitt/action-tmate@v3.18