Fiddle with some deps as I'm building from a clean tree.
This commit is contained in:
parent
6c3d338c12
commit
6e88c44229
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
.keys
|
||||
out
|
@ -814,10 +814,10 @@ apklog:
|
||||
|
||||
fetchdeps:
|
||||
@echo "[fetch] libuv"
|
||||
@test -f out/deps/libuv.tar.gz || curl -q https://dist.libuv.org/dist/v1.48.0/libuv-v1.48.0.tar.gz -o out/deps/libuv.tar.gz
|
||||
@test -f out/deps/libuv.tar.gz || (mkdir -p out/deps/ && curl -q https://dist.libuv.org/dist/v1.48.0/libuv-v1.48.0.tar.gz -o out/deps/libuv.tar.gz)
|
||||
@test -d deps/libuv/ || (mkdir -p deps/libuv/ && tar -C deps/libuv/ -m --strip=1 -xf out/deps/libuv.tar.gz)
|
||||
@echo "[fetch] sqlite"
|
||||
@test -f out/deps/sqlite.zip || curl -q https://www.sqlite.org/2024/sqlite-amalgamation-3450100.zip -o out/deps/sqlite.zip
|
||||
@test -f out/deps/sqlite.zip || (mkdir -p out/deps/ && curl -q https://www.sqlite.org/2024/sqlite-amalgamation-3450100.zip -o out/deps/sqlite.zip)
|
||||
@test -d deps/sqlite/ || (mkdir -p deps/sqlite/ && unzip -qDj -d deps/sqlite/ out/deps/sqlite.zip)
|
||||
@echo "[fetch] prettier"
|
||||
@test -f deps/prettier/standalone.mjs || curl -q --create-dirs -O --output-dir deps/prettier/ https://cdn.jsdelivr.net/npm/prettier@3.2.5/standalone.mjs
|
||||
|
Binary file not shown.
BIN
deps/openssl/android/armeabi-v7a/usr/local/lib/libcrypto.a
vendored
Normal file
BIN
deps/openssl/android/armeabi-v7a/usr/local/lib/libcrypto.a
vendored
Normal file
Binary file not shown.
BIN
deps/openssl/android/armeabi-v7a/usr/local/lib/libssl.a
vendored
Normal file
BIN
deps/openssl/android/armeabi-v7a/usr/local/lib/libssl.a
vendored
Normal file
Binary file not shown.
BIN
deps/openssl/android/x86/usr/local/lib/libcrypto.a
vendored
Normal file
BIN
deps/openssl/android/x86/usr/local/lib/libcrypto.a
vendored
Normal file
Binary file not shown.
BIN
deps/openssl/android/x86/usr/local/lib/libssl.a
vendored
Normal file
BIN
deps/openssl/android/x86/usr/local/lib/libssl.a
vendored
Normal file
Binary file not shown.
Binary file not shown.
BIN
deps/openssl/mingw64/usr/local/lib/libcrypto.a
vendored
Normal file
BIN
deps/openssl/mingw64/usr/local/lib/libcrypto.a
vendored
Normal file
Binary file not shown.
BIN
deps/openssl/mingw64/usr/local/lib/libssl.a
vendored
Normal file
BIN
deps/openssl/mingw64/usr/local/lib/libssl.a
vendored
Normal file
Binary file not shown.
@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
#!/bin/bash
|
||||
|
||||
if [[ -z $ANDROID_NDK ]]; then
|
||||
ANDROID_NDK=~/Android/Sdk/ndk/23.1.7779620
|
||||
if [ -z $ANDROID_NDK_ROOT ]; then
|
||||
ANDROID_NDK_ROOT=~/Android/Sdk/ndk/26.1.10909125
|
||||
fi
|
||||
OPENSSL_VERSION=3.2.1
|
||||
|
||||
@ -11,24 +11,25 @@ BUILD_DIR=out/openssl_android_build
|
||||
|
||||
BUILD_TARGETS="x86_64 x86 arm64-v8a armeabi-v7a"
|
||||
|
||||
rm -rfv openssl-${OPENSSL_VERSION}
|
||||
rm -rf out/openssl-${OPENSSL_VERSION}
|
||||
|
||||
if [ ! -d openssl-${OPENSSL_VERSION} ]
|
||||
then
|
||||
if [ ! -f openssl-${OPENSSL_VERSION}.tar.gz ]
|
||||
then
|
||||
wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz || exit 128
|
||||
wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz -O out/openssl-${OPENSSL_VERSION}.tar.gz | exit 128
|
||||
fi
|
||||
tar xzf openssl-${OPENSSL_VERSION}.tar.gz || exit 128
|
||||
tar -C out/ -xzf out/openssl-${OPENSSL_VERSION}.tar.gz || exit 128
|
||||
fi
|
||||
WORK_DIR=openssl-${OPENSSL_VERSION}
|
||||
WORK_DIR=out/openssl-${OPENSSL_VERSION}
|
||||
|
||||
##### export ndk directory. Required by openssl-build-scripts #####
|
||||
export ANDROID_NDK
|
||||
export ANDROID_NDK_ROOT
|
||||
echo ANDROID_NDK_ROOT=$ANDROID_NDK_ROOT
|
||||
|
||||
##### build-function #####
|
||||
build_the_thing() {
|
||||
TOOLCHAIN=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64
|
||||
TOOLCHAIN=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64
|
||||
export PATH=$TOOLCHAIN/$TRIBLE/bin:$TOOLCHAIN/bin:$PATH
|
||||
echo $PATH
|
||||
export GLOBAL_OPTIONS="
|
||||
@ -78,6 +79,7 @@ build_the_thing() {
|
||||
no-zlib
|
||||
-Os
|
||||
-DOPENSSL_SMALL_FOOTPRINT"
|
||||
pwd
|
||||
echo "./Configure $SSL_TARGET $OPTIONS $GLOBAL_OPTIONS -fuse-ld=$TOOLCHAIN/bin/ld" && \
|
||||
./Configure $SSL_TARGET $OPTIONS $GLOBAL_OPTIONS -fuse-ld=$TOOLCHAIN/bin/ld no-tests && \
|
||||
make clean && \
|
||||
@ -89,7 +91,8 @@ build_the_thing() {
|
||||
for build_target in $BUILD_TARGETS
|
||||
do
|
||||
echo "Building $build_target"
|
||||
cd $WORK_DIR || exit 128
|
||||
pwd
|
||||
pushd $WORK_DIR || exit 128
|
||||
|
||||
case $build_target in
|
||||
armeabi-v7a)
|
||||
@ -124,7 +127,7 @@ do
|
||||
|
||||
rm -rf $DESTDIR
|
||||
build_the_thing
|
||||
cd ..
|
||||
popd
|
||||
#### copy libraries and includes to output-directory #####
|
||||
echo WORK_DIR=$WORK_DIR
|
||||
rm -rf deps/openssl/android/$build_target/
|
||||
|
Loading…
Reference in New Issue
Block a user