mirror of
https://github.com/OpenVPN/openvpn3.git
synced 2024-09-20 20:13:05 +02:00
Merged in schwabe/build_android (pull request #14)
Modify build script of lz4/mbedtls to allow src only builds of dependencies Approved-by: Lev Stipakov <lev@openvpn.net> Approved-by: James Yonan <james@openvpn.net>
This commit is contained in:
commit
c1d542c2da
5
deps/lz4/build-lz4
vendored
5
deps/lz4/build-lz4
vendored
@ -47,6 +47,11 @@ if [ "$NO_WIPE" != "1" ]; then
|
||||
tar xfz $DL/$LZ4_VERSION.tar.gz
|
||||
fi
|
||||
|
||||
if [ "x$NO_BUILD" == x1 ]; then
|
||||
echo "Not building"
|
||||
exit
|
||||
fi
|
||||
|
||||
DIST=$(pwd)/lz4/lz4-$PLATFORM
|
||||
rm -rf $DIST
|
||||
mkdir -p $DIST/include
|
||||
|
5
deps/mbedtls/build-mbedtls
vendored
5
deps/mbedtls/build-mbedtls
vendored
@ -54,6 +54,11 @@ else
|
||||
apply_patches "mbedtls"
|
||||
fi
|
||||
|
||||
if [ "x$NO_BUILD" == x1 ]; then
|
||||
echo "Not building"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [[ "x$TARGET" == xlinux* || "x$TARGET" == xosx* ]]; then
|
||||
# run unit tests and then clean
|
||||
echo RUNNING CHECK
|
||||
|
28
deps/mbedtls/patches/0007-cmake-build.patch
vendored
Normal file
28
deps/mbedtls/patches/0007-cmake-build.patch
vendored
Normal file
@ -0,0 +1,28 @@
|
||||
From 5d31999442a41c154f6c56e91c8fe7705c74e2be Mon Sep 17 00:00:00 2001
|
||||
From: Arne Schwabe <arne@rfc2549.org>
|
||||
Date: Thu, 28 Dec 2017 00:19:10 +0100
|
||||
Subject: [PATCH] Use current cmake directory instead of source root directory
|
||||
when exuting config.pl
|
||||
|
||||
When mdbedtls is added as a subdirectory to another project this will
|
||||
call config.pl with the right path If mbedtls is build standalone
|
||||
current and root source directory are identical.
|
||||
|
||||
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 3e47224ea1..2883eff270 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -31,7 +31,7 @@ find_package(Perl)
|
||||
if(PERL_FOUND)
|
||||
|
||||
# If NULL Entropy is configured, display an appropriate warning
|
||||
- execute_process(COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripts/config.pl -f ${CMAKE_SOURCE_DIR}/include/mbedtls/config.h get MBEDTLS_TEST_NULL_ENTROPY
|
||||
+ execute_process(COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/scripts/config.pl -f ${CMAKE_CURRENT_SOURCE_DIR}/include/mbedtls/config.h get MBEDTLS_TEST_NULL_ENTROPY
|
||||
RESULT_VARIABLE result)
|
||||
if(${result} EQUAL 0)
|
||||
message(WARNING ${NULL_ENTROPY_WARNING})
|
@ -4,3 +4,4 @@
|
||||
if [ "$NO_MOD_PATH" != "1" ]; then
|
||||
export PATH="$SDK/tools:$SDK/platform-tools:$PATH"
|
||||
fi
|
||||
export ANDROID_HOME=$SDK
|
1
vars/vars-android-srconly
Normal file
1
vars/vars-android-srconly
Normal file
@ -0,0 +1 @@
|
||||
# Nothing in here
|
Loading…
Reference in New Issue
Block a user