Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-01-03 13:44:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix openssl android

Browse Source 
Fix openssl android

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
This commit is contained in:
Bensuperpc 2021-08-27 20:44:52 +02:00
parent 8f4db25fc1
commit a9dbd70bf7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/main.yml vendored
View File

@ -54,7 +54,7 @@ jobs:
stockfish_arg: "ARCH=armv7 COMP=ndk", stockfish_arg: "ARCH=armv7 COMP=ndk",
ninja: "no", ninja: "no",
ninja_arg: "", ninja_arg: "",
openssl: "no", openssl: "yes",
openssl_arg: "android-arm no-shared", openssl_arg: "android-arm no-shared",
} }
- { - {
@ -63,7 +63,7 @@ jobs:
stockfish_arg: "ARCH=armv8 COMP=ndk", stockfish_arg: "ARCH=armv8 COMP=ndk",
ninja: "no", ninja: "no",
ninja_arg: "", ninja_arg: "",
openssl: "no", openssl: "yes",
openssl_arg: "android-arm64 no-shared", openssl_arg: "android-arm64 no-shared",
} }
- { - {
@ -72,7 +72,7 @@ jobs:
stockfish_arg: "ARCH=x86-32 COMP=ndk", stockfish_arg: "ARCH=x86-32 COMP=ndk",
ninja: "no", ninja: "no",
ninja_arg: "", ninja_arg: "",
openssl: "no", openssl: "yes",
openssl_arg: "android-x86 no-shared", openssl_arg: "android-x86 no-shared",
} }
- { - {
@ -81,7 +81,7 @@ jobs:
stockfish_arg: "ARCH=x86-64 COMP=ndk", stockfish_arg: "ARCH=x86-64 COMP=ndk",
ninja: "no", ninja: "no",
ninja_arg: "", ninja_arg: "",
openssl: "no", openssl: "yes",
openssl_arg: "android-x86_64 no-shared", openssl_arg: "android-x86_64 no-shared",
} }
# Linux arm64/armv8 images # Linux arm64/armv8 images
@ -453,7 +453,7 @@ jobs:
git clone --depth 1 --branch OpenSSL_1_1_1k https://github.com/openssl/openssl.git git clone --depth 1 --branch OpenSSL_1_1_1k https://github.com/openssl/openssl.git
cd openssl cd openssl
wget https://github.com/mavlink/MAVSDK/blob/main/third_party/openssl/dockcross-android.patch wget https://github.com/mavlink/MAVSDK/blob/main/third_party/openssl/dockcross-android.patch
patch -p 0 < dockcross-android.patch patch Configurations/15-android.conf -i dockcross-android.patch
./../tools/dockcross-command.sh ${{ matrix.arch_name.image }} ./Configure ${{ matrix.arch_name.openssl_arg }} ./../tools/dockcross-command.sh ${{ matrix.arch_name.image }} ./Configure ${{ matrix.arch_name.openssl_arg }}
./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j2 ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j2
cd .. cd ..
@ -467,7 +467,7 @@ jobs:
./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.C-Plus-Plus_arg }} ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.C-Plus-Plus_arg }}
cd .. cd ..
rm -rf C-Plus-Plus rm -rf C-Plus-Plus
- name: C-Plus-Plus build test - name: fmt build test
if: ${{ matrix.arch_name.fmt == 'yes' }} if: ${{ matrix.arch_name.fmt == 'yes' }}
run: | run: |
git clone --depth 1 --branch 8.0.1 https://github.com/fmtlib/fmt.git git clone --depth 1 --branch 8.0.1 https://github.com/fmtlib/fmt.git