mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2026-02-11 00:00:08 +08:00
Squashed 'Sources/OpenVPNAdapter/Libraries/Vendors/openvpn/' changes from 275cf80efb..7db7a009b0
7db7a009b0 proto: Client complains about stub compressors 390154d0e4 Update Build instructions for OSX 1b92069834 deps: Update to mbedtls-2.7.12 8cab79540d compression: Extend compression alert to include server pushes 67b4641a99 CompressContext: Add is_any_stub() method cdf9e7bece compression: Issue an Event if compression is activated fa38064403 build script: added a new PROF type "auto" that tries to automatically determine the local platform 7ce7b52b7c MTRand: added OPENVPN_INSECURE_RANDOM compile flag that allows MTRand to masquerade as a secure RNG 85e7e49f72 MTRand: added constructor accepting an initialization seed 1fa3229a10 IPv4, IPv6: added #include <openvpn/common/hash.hpp> 48e9217d26 vcxproj: add missing header file d2a2601b2f Wintun: unmap ring buffers e320bc63ff openssl: Improve OpenSSLContext fencing against multiple declarations 2f8fe2d318 openssl: Missing inline keyword in a couple of compat functions 32b984c0ff enum_dir: use a function template 725ee04593 VPNServerNetblock::Netblock::to_string(): show prefix_len 409d1c52b8 ManClientInstance::Send::describe_user(): added bool show_userprop parameter e05fc16b20 string::indent(): try to fix all the corner cases 4e1645ea80 RunContext: mark virtual Stop* async_stop() with override attribute e8b31c5454 cli: advertise "openurl" as supported SSO method 80b45731eb ICMPv6: added DEST_UNREACH code 679003094d AsioTimerSafe: refactor to allow as drop-in replacement for AsioTimer f7845578f1 RunContext: check for halt in timer closure 84483eda25 AsioPolySock: add support for socket shutdown 1b3402aec3 tcplinkcommon.hpp: added missing include 2e26c7565c time: added nanotime_t typedef c3c8ab7f6b string: added additional detail to split() comment 95ce4f22c8 string: added to_delim() method then redefined first_line() method to use it 448218b1e1 string: added add_leading() method e3b0bf4f5c MSF iterator: allow conversion from ordinary iterator and added exists() method 11412ac50a AsioPolySock: in remote_endpoint_str() method, test for alt_routing_enabled() 9fb4e705f9 Added TimeSkew to skew a time duration by a random flux 7496383002 write_binary_atomic: reduce the length of the temporary filename b31d9c0191 auth-token-user: increase size limit to 340 chars c82644c03a Added BufferLineIterator 115cb656b6 RandomAPI: added randbyte() and randbool() methods 4fa8348689 RunContext: ASIO SIGNAL message now shows signal name rather than number ebfce58513 Added StaticBuffer, a constant-length Buffer for writing that cannot be extended c8f9cb88a4 string::split(): call reserve() on return vector f15e566065 read_binary_unix_fast: should return an int (i.e. errno), not a bool 60501b4513 random: factor out rand32_distribute() from RandomAPI::randrange32() 90123495a5 wintun: get device interfaces list only once ec790df73b wintun: read packets in bulk 0f85d3f729 wintun: use correct io_context when performing initial read a6151cdeab wintun: use auto-reset events 29acfd95f3 libs: update ASIO to 1.14.0 438a0ef287 Remove outdated and unused android build files e9df57969f Merge remote-tracking branch 'origin/released' 44725ad094 ssl: Fix building with OpenSSL 1.0.2 efe3f1f635 version: Reset version reference for git master 8c79c06d94 Make tls-crypt/tls-cryptv2 compile with multiple compilation units 4d18aaeb88 Fix LLVM warnings reported during OS X build 8c9496bb4d Use const_cast for SSL_session_reused 33be562a39 Add missing override keywords to openssl/sslctx.hpp 2c5435a000 dcocli: use compile time define for Tun methods instead of hardcoded iproute 7c39088f00 Allow overriding reported HW_ADDR and support IV_PLAT_VER 7bb1ea19ee Move sending IV_UI_VER and IV_SSO to build_peer_info 23959fa705 Add reporting of IV_SSL_VER 63ab5b5e46 Only initialise static member in OpenSSLContext once ecebb40304 Merge remote-tracking branch 'origin/qa' 52c9702502 wintun: replace volatiles with atomics d720c7104c appveyor: install Strawberry perl 60a253a7ef appveyor: update to VS2019 48f2b5100b wintun: support for privilege separation 6f266be3d8 wintun: ring buffers support baa1ce2ccf vcxproj: bump VS version to 2019 98bfd037e3 tun/win: factor out ClientConfig into separate header aeb5ce0ad7 wintun: open device with SetupAPI 3998d303ce Finalizing the OpenVPN 3 Core library 3.3 release 728733aee7 deps/mbedtls: rebase "enable unsupported critical extensions" patch 43e36ca45a lib-version: update to mbedtls-2.7.11 4dbcd85e50 openssl/cipher.hpp: add missing include <compat.hpp> 69d72ed64f DCOTransport: Fix server side specific trunk handling ff732e3b5d Fix OpenVPN Core build with OpenSSL 1.1.0 0da42f393f Do not use deprecated OpenSSL 1.1.0 methods 35062c0b60 travis.yml: update environment 47046cf6d2 Merge branch 'qa' 6933c395a4 [OVPN3-423] cliconnect.hpp: fix reconnect on Windows after sleep 462c36c813 random_subnet(): added comment ac1d447156 IP::Addr::from_byte_string(): fixed bug for IPv6 case d6eaea3468 string::split(): minor implementation tweaks ca15b7cdf4 hexstr: added dump_hex() variant accepting void * 0e61a2afd7 SessionIDType::find_weak: added conflict parameter 089aec00b1 DCOTransport: new routing code for trunk links 5befbd430f build: added CAP=1 -- build with libcap eb85ada21e signals: added trivial signal_name() function f89013ef92 RunContext: don't try to catch SIGQUIT by default e0ee540135 SessionIDType: added hash() method f0e1f8aa42 logging: added basic components for logrotate fbb0c81f29 UMask: added UMaskDaemon, a umask context object appropriate for daemons 1c7bac90d9 build script: when building with DEBUG=1 on Linux, use -ggdb instead of -g 73cce80e43 OpenSSL: added openssl_reseed_rng() function 25780cf798 OpenSSL: fixed some memory leaks in CipherContextGCM and TokenEncrypt 168dba95f5 OpenSSL: define OPENSSL_SERVER_SNI when OpenSSL version is at least 1.1 84e78d8fed SNI: added OpenVPN client support for SNI (currently OpenSSL only) 310766b270 build: added MTLS_DIST setting 4eaa46a879 MbedTLS: added MBEDTLS_DISABLE_NAME_CONSTRAINTS preprocessor flag 16226d1b05 OpenSSLSign: updated for OpenSSL 1.1 aed0678c96 SSL: added SNI::Metadata, an abstract base class for packaging app-specific SNI metadata in AuthCert 001b731fe2 SNI: create SNI namespace and rename SNIHandlerBase -> SNI::HandlerBase 4bd5869305 README.rst: Make Windows-specific build steps up to date. ac365ee977 wintun: support for 0.4 9245056a2a wintun: support for 0.3 b73d484950 mbedtls: throw exception on unsupported SSL:Const::PEER_CERT_OPTIONAL option 1d6bae4b5b tcplinkcommon: bubble up real exception error c18c8bd156 tcpcli: ensure SSL Factory survives as long as TLS link 4192193087 tls: parse and load TLS specific CA 2a19b7fcff win/tuncli.hpp: fix Wintun padding calculation 44cb9f44da appveyor: make ReleaseOpenSSL default configuration 5485de19a2 win/impersonate: refactor impersonate logic 29a655147b win/tunsetup.hpp: remove unneeded parameter 61794b0efd win: link OpenSSL dynamically e569b84465 win/tuncli.hpp: fix indentation 374c57e708 frame_init.hpp: tweak wintun read buf size c3c45c9b38 tun: added Error::TUN_HALT for tun_error() signaling acd7af5e9a RandomAPI: added randrange32() method c1a7f8cc68 std::clamp() is useful but only available in C++17 and up, so we add our own clamp() f8c71ef1ce Minor change to Error::INACTIVE_TIMEOUT handler 3202ab5fce OpenSSLSign: renamed OpenSSLPKI::X509Base to OpenSSLPKI::X509 to conform to changes in OpenSSLPKI 8d767febb5 ReachabilityBase: added virtual destructor 6a4826965f MbedTLS: update json_override() prototype bee0d8d187 SSL: added SSLConst::SEND_CLIENT_CA_LIST server-side flag and implemented for OpenSSL 5eb39c1dea AuthCert: save the SNI name 3b34449d0e SSLAPI: auth_cert() can now be const a672e91631 SNI server-side: support additional JSON configuration settings 95e761f3cc OpenSSL PKI cleanup d5eb77c53c AuthCert::Fail cleanup 6e98b9aadc SSLAPI: move PKType from SSLConfigAPI into standalone header to avoid dependency inversion bbae814864 OpenSSL: added SNI implementation 5def1d23ab OpenSSLContext: in constructor, removed redundant if statement 1a0747e783 OpenSSLContext: in constructor, consolidate sslopt fixed flags eef9868816 OpenSSLContext::SSL::ssl_handshake_details(): include leaf-cert CN in details f9631cd90f AuthCert::Fail: use std::string for the reason string (instead of const char *) a17b77641f OpenSSLPKI::X509: copy constructor doesn't need erase() and define X509::Ptr 78cae5bb52 OpenSSLPKI::DH: copy constructor doesn't need erase() c0d43a4153 RCPtr: added static_pointer_cast() method 34a3f264f5 [OVPN-314] Add support for signalling SSO support via IV_SSO 7d112eb3e5 cli: enable utf8 console output 980ef1eff8 win/call.hpp: re-encode command output to utf8 fddb440e99 unicode.hpp: customize utf16 conversion routine 4d7c12ac4d [OVPN3-405] Support for non-ASCII profile path on Windows git-subtree-dir: Sources/OpenVPNAdapter/Libraries/Vendors/openvpn git-subtree-split: 7db7a009b0b4eca0fc3733c99c50aff7f7c2556f
This commit is contained in:
Sergey Abramchuk
@@ -1,55 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
# Build the entire core package as required by Android App
|
||||
set -e
|
||||
if [ -z "$O3" ]; then
|
||||
echo O3 var must point to ovpn3 tree
|
||||
exit 1
|
||||
fi
|
||||
|
||||
[ -z "$ECHO" ] && ECHO=0
|
||||
|
||||
if [ "$ECHO" -eq 0 ]; then
|
||||
exec > $O3/android_build.log
|
||||
exec 2>&1
|
||||
fi
|
||||
|
||||
[ -z "$DEP_DIR" ] && export DEP_DIR=${O3}/deps
|
||||
[ -z "$DL" ] && export DL=~/dl
|
||||
|
||||
mkdir -p $DEP_DIR
|
||||
mkdir -p $DL
|
||||
|
||||
export NO_MOD_PATH=1
|
||||
. $O3/core/vars/android-sdk-path
|
||||
|
||||
echo BUILD ANDROID SDK
|
||||
$O3/core/scripts/android/build-sdk
|
||||
|
||||
echo BUILD TOOLCHAIN
|
||||
$O3/core/scripts/android/build-toolchain
|
||||
|
||||
echo BUILD DEPS
|
||||
cd $DEP_DIR
|
||||
rm -rf asio* lz4* mbedtls* #lzo* boost* minicrypto openssl* polarssl* snappy*
|
||||
echo "******* ASIO"
|
||||
$O3/core/deps/asio/build-asio
|
||||
echo "******* MBEDTLS"
|
||||
$O3/core/scripts/android/build-mbedtls
|
||||
echo "******* LZ4"
|
||||
$O3/core/scripts/android/build-lz4
|
||||
|
||||
#echo "******* BOOST"
|
||||
#$O3/core/scripts/android/build-boost
|
||||
#echo "******* MINICRYPTO"
|
||||
#$O3/core/scripts/android/build-minicrypto
|
||||
#echo "******* OpenSSL"
|
||||
#$O3/core/scripts/android/build-openssl-small
|
||||
#echo "******* LZO"
|
||||
#$O3/core/scripts/android/build-lzo
|
||||
#echo "******* SNAPPY"
|
||||
#$O3/core/scripts/android/build-snappy
|
||||
|
||||
echo BUILD CORE LIBRARY
|
||||
$O3/core/javacli/build-android
|
||||
|
||||
echo DONE.
|
||||
@@ -1,23 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
# Note: thread library may fail with PAGE_SIZE undefined.
|
||||
# The pthread.h header makes reference to the PAGE_SIZE define however
|
||||
# this only gets defined in <asm/page.h> which is not pulled in by any
|
||||
# of the pthread.h includes. A google-suggested fix was to add
|
||||
# #include <sys/mman.h>, which does indeed work, but may not be the
|
||||
# correct solution for all cases.
|
||||
set -e
|
||||
if [ -z "$O3" ]; then
|
||||
echo O3 var must point to ovpn3 tree ; exit 1
|
||||
fi
|
||||
if [ -z "$DEP_DIR" ]; then
|
||||
echo DEP_DIR var must point to ovpn3 dependency tree
|
||||
exit 1
|
||||
fi
|
||||
cd $DEP_DIR
|
||||
rm -rf boost
|
||||
mkdir boost
|
||||
export LINK_MODE=static
|
||||
export TARGETS="android-a8a android-a8a-dbg android-a7a android-a7a-dbg"
|
||||
export SDK_PATH_SCRIPT=$O3/core/vars/android-sdk-path
|
||||
$O3/core/deps/boost/build-boost
|
||||
exit 0
|
||||
@@ -1,25 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
if [ -z "$O3" ]; then
|
||||
echo O3 var must point to ovpn3 tree
|
||||
exit 1
|
||||
fi
|
||||
if [ -z "$DEP_DIR" ]; then
|
||||
echo DEP_DIR var must point to the dependency build directory
|
||||
exit 1
|
||||
fi
|
||||
|
||||
. $O3/core/vars/android-sdk-path
|
||||
|
||||
cd $DEP_DIR
|
||||
rm -rf lz4
|
||||
mkdir lz4
|
||||
|
||||
TARGETS=${TARGETS:-android-a7a android-a8a android-x86}
|
||||
|
||||
for target in $TARGETS; do
|
||||
echo '***************' TARGET $target
|
||||
TARGET=$target $O3/core/deps/lz4/build-lz4
|
||||
done
|
||||
exit 0
|
||||
@@ -1,22 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
if [ -z "$O3" ]; then
|
||||
echo O3 var must point to ovpn3 tree ; exit 1
|
||||
fi
|
||||
if [ -z "$DEP_DIR" ]; then
|
||||
echo DEP_DIR var must point to ovpn3 dependency tree
|
||||
exit 1
|
||||
fi
|
||||
cd $DEP_DIR
|
||||
|
||||
. $O3/core/vars/android-sdk-path
|
||||
|
||||
rm -rf lzo
|
||||
mkdir lzo
|
||||
|
||||
for target in android-a8a android-a8a-dbg android-a7a android-a7a-dbg ; do
|
||||
echo '***************' TARGET $target
|
||||
TARGET=$target $O3/core/deps/lzo/build-lzo
|
||||
done
|
||||
exit 0
|
||||
@@ -1,30 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
if [ -z "$O3" ]; then
|
||||
echo O3 var must point to ovpn3 tree
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "$DEP_DIR" ]; then
|
||||
echo DEP_DIR var must point to the dependency build directory
|
||||
exit 1
|
||||
fi
|
||||
|
||||
. $O3/core/vars/android-sdk-path
|
||||
|
||||
cd $DEP_DIR
|
||||
rm -rf mbedtls
|
||||
mkdir -p mbedtls
|
||||
|
||||
# disable minicrypto for now
|
||||
mini=0
|
||||
|
||||
TARGETS=${TARGETS:-android-a7a android-a8a android-x86}
|
||||
|
||||
for target in $TARGETS; do
|
||||
echo '***************' TARGET $target
|
||||
VERBOSE=1 TARGET=$target CMAKE_TARGET=android USE_MINICRYPTO=$mini MINICRYPTO_DIR=$(pwd)/minicrypto/minicrypto-$target $O3/core/deps/mbedtls/build-mbedtls
|
||||
[ "$ANDROID_DBG_ONLY" = "1" ] && exit
|
||||
done
|
||||
exit 0
|
||||
@@ -1,22 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
if [ -z "$O3" ]; then
|
||||
echo O3 var must point to ovpn3 tree ; exit 1
|
||||
fi
|
||||
if [ -z "$DEP_DIR" ]; then
|
||||
echo DEP_DIR var must point to ovpn3 dependency tree
|
||||
exit 1
|
||||
fi
|
||||
cd $DEP_DIR
|
||||
|
||||
. $O3/core/vars/android-sdk-path
|
||||
|
||||
rm -rf minicrypto
|
||||
mkdir minicrypto
|
||||
|
||||
for target in android-a7a android-a7a-dbg ; do
|
||||
echo '***************' TARGET $target
|
||||
TARGET=$target $O3/core/deps/minicrypto/build-minicrypto
|
||||
done
|
||||
exit 0
|
||||
@@ -1,39 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -e
|
||||
if [ -z "$O3" ]; then
|
||||
echo O3 var must point to ovpn3 tree ; exit 1
|
||||
fi
|
||||
if [ -z "$DEP_DIR" ]; then
|
||||
echo DEP_DIR var must point to ovpn3 dependency tree
|
||||
exit 1
|
||||
fi
|
||||
cd $DEP_DIR
|
||||
. $O3/core/deps/lib-versions
|
||||
. $O3/core/vars/android-sdk-path
|
||||
[ -z "$DL" ] && DL=~/Downloads
|
||||
rm -rf openssl
|
||||
mkdir openssl
|
||||
for TARGET in android-a8a android-a8a-dbg android-a7a android-a7a-dbg android-dbg android ; do
|
||||
. $O3/core/vars/vars-$TARGET
|
||||
export OPENSSL=$OPENSSL_VERSION
|
||||
export DIST=$(pwd)/openssl-$PLATFORM
|
||||
export BIN=$TC/bin
|
||||
rm -rf $DIST
|
||||
rm -rf $OPENSSL
|
||||
tar xfz $DL/$OPENSSL.tar.gz
|
||||
pushd $OPENSSL
|
||||
OSSL_FLAGS="no-shared threads no-idea no-mdc2 no-rc5 no-engine no-comp no-hw no-ssl2 no-ssl3 no-zlib no-rc2 no-cast no-md2 no-ripemd no-camellia no-seed no-krb5 no-socks no-ecdsa no-ec no-ecdh no-md2 no-whirlpool no-dsa no-cms no-jpake no-gost"
|
||||
#OSSL_FLAGS="no-shared threads no-comp no-zlib"
|
||||
./Configure linux-armv4 $OSSL_FLAGS --prefix=$DIST
|
||||
sed -i "" -e "s|-O3|$LIB_OPT_LEVEL $LIB_FPIC $PLATFORM_FLAGS $OTHER_COMPILER_FLAGS|" Makefile
|
||||
sed -i "" -e "s|ERR_load_COMP_strings()|//ERR_load_COMP_strings()|" crypto/err/err_all.c
|
||||
make -j 4 build_libs
|
||||
touch apps/openssl
|
||||
touch openssl.pc
|
||||
touch libcrypto.pc
|
||||
touch libssl.pc
|
||||
make install_sw
|
||||
popd
|
||||
mv $DIST openssl
|
||||
done
|
||||
exit 0
|
||||
@@ -1,27 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
if [ -z "$O3" ]; then
|
||||
echo O3 var must point to ovpn3 tree ; exit 1
|
||||
fi
|
||||
if [ -z "$DEP_DIR" ]; then
|
||||
echo DEP_DIR var must point to ovpn3 dependency tree
|
||||
exit 1
|
||||
fi
|
||||
cd $DEP_DIR
|
||||
|
||||
. $O3/core/vars/android-sdk-path
|
||||
|
||||
# disable minicrypto for now
|
||||
mini=0
|
||||
|
||||
rm -rf polarssl
|
||||
mkdir polarssl
|
||||
|
||||
for target in android-a8a android-a8a-dbg android-a7a android-a7a-dbg ; do
|
||||
echo '***************' TARGET $target
|
||||
VERBOSE=1 TARGET=$target CMAKE_TARGET=android USE_MINICRYPTO=$mini MINICRYPTO_DIR=$(pwd)/minicrypto/minicrypto-$target $O3/core/deps/polarssl/build-polarssl
|
||||
mv polarssl-$target polarssl/
|
||||
[ "$ANDROID_DBG_ONLY" = "1" ] && exit
|
||||
done
|
||||
exit 0
|
||||
@@ -1,47 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
if [ -z "$O3" ]; then
|
||||
echo O3 var must point to ovpn3 tree
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "$DEP_DIR" ]; then
|
||||
echo DEP_DIR var must point to the dependency build directory
|
||||
exit 1
|
||||
fi
|
||||
|
||||
[ -z "$SDK" ] && export SDK=$DEP_DIR/android-sdk
|
||||
|
||||
if [ -d "$SDK" ]; then
|
||||
echo "Android SDK already exists at $SDK. Doing only update"
|
||||
else
|
||||
. $O3/core/deps/functions.sh
|
||||
|
||||
FNAME=sdk-tools-linux-3859397.zip
|
||||
URL=https://dl.google.com/android/repository/${FNAME}
|
||||
CSUM=444e22ce8ca0f67353bda4b85175ed3731cae3ffa695ca18119cbacef1c1bea0
|
||||
|
||||
download
|
||||
|
||||
cd $DEP_DIR
|
||||
rm -rf android-sdk
|
||||
mkdir android-sdk
|
||||
|
||||
. $O3/core/vars/android-sdk-path
|
||||
|
||||
cd $SDK
|
||||
unzip $DL/$FNAME
|
||||
fi
|
||||
|
||||
yes | $SDK/tools/bin/sdkmanager --licenses
|
||||
$SDK/tools/bin/sdkmanager --update
|
||||
$SDK/tools/bin/sdkmanager --install 'build-tools;26.0.2' \
|
||||
'ndk-bundle' \
|
||||
'extras;android;m2repository' \
|
||||
'patcher;v4' \
|
||||
'platform-tools' \
|
||||
'platforms;android-26' \
|
||||
'tools'
|
||||
|
||||
exit 0
|
||||
@@ -1,22 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -e
|
||||
if [ -z "$O3" ]; then
|
||||
echo O3 var must point to ovpn3 tree ; exit 1
|
||||
fi
|
||||
if [ -z "$DEP_DIR" ]; then
|
||||
echo DEP_DIR var must point to ovpn3 dependency tree
|
||||
exit 1
|
||||
fi
|
||||
cd $DEP_DIR
|
||||
|
||||
. $O3/core/vars/android-sdk-path
|
||||
|
||||
rm -rf snappy
|
||||
mkdir snappy
|
||||
|
||||
for target in android-a8a android-a8a-dbg android-a7a android-a7a-dbg ; do
|
||||
echo '***************' TARGET $target
|
||||
TARGET=$target $O3/core/deps/snappy/build-snappy
|
||||
done
|
||||
exit 0
|
||||
@@ -1,66 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
# Build the Android toolchain (run first)
|
||||
#set -e
|
||||
if [ -z "$O3" ]; then
|
||||
echo O3 var must point to ovpn3 tree ; exit 1
|
||||
fi
|
||||
export DEP_DIR=${DEP_DIR:-$HOME/src/android}
|
||||
export NO_MOD_PATH=1
|
||||
. $O3/core/vars/android-sdk-path
|
||||
|
||||
# 64 bit
|
||||
cd $DEP_DIR
|
||||
DEST=$(pwd)/tc-arm64
|
||||
rm -rf $DEST
|
||||
ABI=aarch64-linux-android
|
||||
ABI_VER=4.9
|
||||
$NDK/build/tools/make-standalone-toolchain.sh \
|
||||
--verbose \
|
||||
--toolchain=$ABI-$ABI_VER \
|
||||
--stl=gnustl \
|
||||
--arch=arm64 \
|
||||
--platform=android-21 \
|
||||
--install-dir=$DEST
|
||||
cd $DEST/$ABI/bin
|
||||
ln -s ../../bin/$ABI-gcc cc
|
||||
ln -s ../../bin/$ABI-gcc gcc
|
||||
ln -s ../../bin/$ABI-g++ g++
|
||||
ln -s ../../libexec/gcc/$ABI/$ABI_VER.x/cc1 cc1
|
||||
ln -s ../../libexec/gcc/$ABI/$ABI_VER.x/cc1plus cc1plus
|
||||
|
||||
# 32 bit
|
||||
cd $DEP_DIR
|
||||
DEST=$(pwd)/tc-arm
|
||||
rm -rf $DEST
|
||||
ABI=arm-linux-androideabi
|
||||
ABI_VER=4.9
|
||||
$NDK/build/tools/make-standalone-toolchain.sh \
|
||||
--verbose \
|
||||
--toolchain=$ABI-$ABI_VER \
|
||||
--stl=gnustl \
|
||||
--arch=arm \
|
||||
--platform=android-16 \
|
||||
--install-dir=$DEST
|
||||
cd $DEST/$ABI/bin
|
||||
ln -s ../../bin/$ABI-gcc cc
|
||||
ln -s ../../libexec/gcc/$ABI/$ABI_VER.x/cc1 cc1
|
||||
ln -s ../../libexec/gcc/$ABI/$ABI_VER.x/cc1plus cc1plus
|
||||
|
||||
# 32 bit x86 for Android emulator
|
||||
cd $DEP_DIR
|
||||
DEST=$(pwd)/tc-x86
|
||||
rm -rf $DEST
|
||||
ABI=x86-linux-android
|
||||
SUB=i686-linux-android
|
||||
ABI_VER=4.9
|
||||
$NDK/build/tools/make-standalone-toolchain.sh \
|
||||
--verbose \
|
||||
--toolchain=$ABI-$ABI_VER \
|
||||
--stl=gnustl \
|
||||
--arch=x86 \
|
||||
--platform=android-16 \
|
||||
--install-dir=$DEST
|
||||
cd $DEST/$SUB/bin
|
||||
ln -s ../../bin/$SUB-gcc cc
|
||||
ln -s ../../libexec/gcc/$SUB/$ABI_VER.x/cc1 cc1
|
||||
ln -s ../../libexec/gcc/$SUB/$ABI_VER.x/cc1plus cc1plus
|
||||
@@ -35,6 +35,7 @@ if [ -z "$1" ]; then
|
||||
echo " MTLS_SYS=1 -- use system mbedTLS"
|
||||
echo " MTLS_PATH=path -- use user specified mbedTLS source folder"
|
||||
echo " MTLS_LIBS=ldflags -- user specific mbedTLS LDFLAGS"
|
||||
echo " MTLS_DIST=path -- use user-specified mbedTLS distribution"
|
||||
echo " MA_HYBRID=1 -- use mbedTLS/AppleCrypto hybrid"
|
||||
echo " OPENSSL_DIST=<dir> -- specify custom OpenSSL build"
|
||||
echo " NOSSL=1 -- don't include OpenSSL"
|
||||
@@ -49,6 +50,7 @@ if [ -z "$1" ]; then
|
||||
echo " LZ4_SYS=1 -- build with system LZ4 compression library"
|
||||
echo " SNAP=1 -- build with Snappy compression library"
|
||||
echo " CITY=1 -- build with Cityhash hash library"
|
||||
echo " CAP=1 -- build with libcap"
|
||||
echo " VAL=1 -- build with valgrind run-time extensions"
|
||||
echo " JAVA=1 -- build with JVM"
|
||||
echo ' EXTRA_CPP="foo1.cpp foo2.cpp" -- add extra .cpp files'
|
||||
@@ -59,6 +61,18 @@ if [ -z "$1" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# determine platform if PROF is set to "auto"
|
||||
if [ "$PROF" = "auto" ]; then
|
||||
if [ "$(uname)" == "Darwin" ]; then
|
||||
export PROF=osx64
|
||||
elif [ "$(uname)" == "Linux" ]; then
|
||||
export PROF=linux
|
||||
else
|
||||
echo "PROF=auto : cannot determine platform"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# source vars file
|
||||
if [ "$PROF" ]; then
|
||||
suffix=""
|
||||
@@ -123,7 +137,12 @@ FLAGS="$FLAGS -Wno-sign-compare -Wno-unused-parameter"
|
||||
#fi
|
||||
|
||||
# MbedTLS
|
||||
if [ "$MTLS_SYS" = "1" ]; then
|
||||
if [ -n "$MTLS_DIST" ]; then
|
||||
CPPFLAGS="$CPPFLAGS -DUSE_MBEDTLS -I$MTLS_DIST/include"
|
||||
LIBDIRS="$LIBDIRS -L$MTLS_DIST/library"
|
||||
LIBS="$LIBS -lmbedtls -lmbedx509 -lmbedcrypto"
|
||||
MTLS=1
|
||||
elif [ "$MTLS_SYS" = "1" ]; then
|
||||
CPPFLAGS="$CPPFLAGS -DUSE_MBEDTLS"
|
||||
LIBS="$LIBS -lmbedtls -lmbedx509 -lmbedcrypto"
|
||||
elif [ "$MTLS" = "1" ]; then
|
||||
@@ -257,6 +276,12 @@ if [ "$CITY" = "1" ]; then
|
||||
CPPFLAGS="$CPPFLAGS -DHAVE_CITYHASH"
|
||||
fi
|
||||
|
||||
# libcap
|
||||
if [ "$CAP" = "1" ]; then
|
||||
LIBS="$LIBS -lcap"
|
||||
CPPFLAGS="$CPPFLAGS -DHAVE_LIBCAP"
|
||||
fi
|
||||
|
||||
# Valgrind
|
||||
if [ "$VAL" = "1" ]; then
|
||||
CPPFLAGS="$CPPFLAGS -DHAVE_VALGRIND"
|
||||
@@ -330,8 +355,12 @@ fi
|
||||
|
||||
# release/debug builds
|
||||
if [ "$DEBUG" = "1" ]; then
|
||||
# debug build
|
||||
FLAGS="-g $FLAGS"
|
||||
# build with debug symbols
|
||||
if [ "$PLATFORM" = "linux" ]; then
|
||||
FLAGS="-ggdb $FLAGS"
|
||||
else
|
||||
FLAGS="-g $FLAGS"
|
||||
fi
|
||||
else
|
||||
# release build
|
||||
[ "$LTO" = "1" ] && [ "$CLANG" != "1" ] && FLAGS="$FLAGS -flto=4 -Wl,--no-as-needed"
|
||||
|
||||
Reference in New Issue
Block a user