mirror/openvpn3
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn3.git synced 2024-09-20 04:02:15 +02:00
Code

Build cityhash on OS X and Windows to run pg related unit test

Browse Source 
Also increase minimum OS version to 10.12 since the 10.8 target defaults
to libstdc++, which is not available on modern macOS versions

Signed-off-by: Arne Schwabe <arne@openvpn.net>
This commit is contained in:
Arne Schwabe 2019-10-14 17:58:51 +02:00
parent 16342679fe
commit 717109f1f4
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deps/cityhash/build-cityhash vendored
View File

@ -33,11 +33,11 @@ CSUM=${CITYHASH_CSUM}
download
CC=cc
CXX=c++
LD=ld
AR=ar
RANLIB=ranlib
[ "$GCC_CMD" ] && CC=$GCC_CMD
[ "$GPP_CMD" ] && CXX=$GPP_CMD
[ "$LD_CMD" ] && LD=$LD_CMD
[ "$AR_CMD" ] && AR=$AR_CMD
[ "$RANLIB_CMD" ] && RANLIB=$RANLIB_CMD
@ -55,7 +55,7 @@ cd cityhash-$CITYHASH_VERSION
CMD=./configure
echo $CMD
$CMD
CMD="$CC $PLATFORM_FLAGS $OTHER_COMPILER_FLAGS $LIB_OPT_LEVEL $LIB_FPIC -I. -Isrc -c src/city.cc"
CMD="$CXX $PLATFORM_FLAGS $OTHER_COMPILER_FLAGS $LIB_OPT_LEVEL $LIB_FPIC -I. -Isrc -c src/city.cc"
echo $CMD
$CMD
$AR rc $DIST/lib/libcityhash.a city.o

2
scripts/mac/build-all
View File

@ -13,6 +13,8 @@ echo "******* MBEDTLS"
$O3/core/scripts/mac/build-mbedtls
echo "******* LZ4"
$O3/core/scripts/mac/build-lz4
echo "******* CITYHASH"
$O3/core/scripts/mac/build-cityhash
#echo "******* MINICRYPTO"
#$O3/core/scripts/mac/build-minicrypto

14
scripts/mac/build-cityhash Executable file
View File

@ -0,0 +1,14 @@
#!/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
rm -rf cityhash
mkdir cityhash
TARGET=osx $O3/core/deps/cityhash/build-cityhash
exit 0

2
vars/vars-osx
View File

@ -4,7 +4,7 @@ export APPLE_FAMILY=1
export DEBUG_BUILD=0
export GPP_CMD=clang++
export GCC_CMD=clang
export MIN_DEPLOY_TARGET="-mmacosx-version-min=10.8"
export MIN_DEPLOY_TARGET="-mmacosx-version-min=10.12"
export PLATFORM_FLAGS="-arch x86_64 -arch i386 $MIN_DEPLOY_TARGET"
export OTHER_COMPILER_FLAGS="-fvisibility=hidden -fvisibility-inlines-hidden"
export CXX_COMPILER_FLAGS="-std=c++11 -stdlib=libc++"