passepartoutvpn
/
openssl-apple
mirror of https://github.com/passepartoutvpn/openssl-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow to disable embedding Bitcode for OpenSSL 1.1.0+ too

This commit is contained in:
g4bor k0vacs 2017-03-13 02:20:27 +01:00
parent fd0b497792
commit db8e598554
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build-libssl.sh
View File

@ -50,6 +50,7 @@ echo_help()
echo " --ios-sdk=SDKVERSION Override iOS SDK version" echo " --ios-sdk=SDKVERSION Override iOS SDK version"
echo " --noparallel Disable running make with parallel jobs (make -j)" echo " --noparallel Disable running make with parallel jobs (make -j)"
echo " --tvos-sdk=SDKVERSION Override tvOS SDK version" echo " --tvos-sdk=SDKVERSION Override tvOS SDK version"
echo " --disable-bitcode Disable embedding Bitcode"
echo " -v, --verbose Enable verbose logging" echo " -v, --verbose Enable verbose logging"
echo " --verbose-on-error Dump last 500 lines from log file if an error occurs (for Travis builds)" echo " --verbose-on-error Dump last 500 lines from log file if an error occurs (for Travis builds)"
echo " --version=VERSION OpenSSL version to build (defaults to ${DEFAULTVERSION})" echo " --version=VERSION OpenSSL version to build (defaults to ${DEFAULTVERSION})"
@ -57,7 +58,6 @@ echo_help()
echo "Options for OpenSSL 1.0.2 and lower ONLY" echo "Options for OpenSSL 1.0.2 and lower ONLY"
echo " --archs=\"ARCH ARCH ...\" Space-separated list of architectures to build" echo " --archs=\"ARCH ARCH ...\" Space-separated list of architectures to build"
echo " Options: ${DEFAULTARCHS}" echo " Options: ${DEFAULTARCHS}"
echo " --disable-bitcode Disable embedding Bitcode"
echo echo
echo "Options for OpenSSL 1.1.0 and higher ONLY" echo "Options for OpenSSL 1.1.0 and higher ONLY"
echo " --deprecated Exclude no-deprecated configure option and build with deprecated methods" echo " --deprecated Exclude no-deprecated configure option and build with deprecated methods"
@ -377,16 +377,14 @@ echo "Build options"
echo " OpenSSL version: ${VERSION}" echo " OpenSSL version: ${VERSION}"
if [ "${BUILD_TYPE}" == "archs" ]; then if [ "${BUILD_TYPE}" == "archs" ]; then
echo " Architectures: ${ARCHS}" echo " Architectures: ${ARCHS}"
if [ "${CONFIG_DISABLE_BITCODE}" == "true" ]; then
echo " Bitcode disabled"
else
echo " Bitcode enabled"
fi
else else
echo " Targets: ${TARGETS}" echo " Targets: ${TARGETS}"
fi fi
echo " iOS SDK: ${IOS_SDKVERSION}" echo " iOS SDK: ${IOS_SDKVERSION}"
echo " tvOS SDK: ${TVOS_SDKVERSION}" echo " tvOS SDK: ${TVOS_SDKVERSION}"
if [ "${CONFIG_DISABLE_BITCODE}" == "true" ]; then
echo " Bitcode embedding disabled"
fi
echo " Number of make threads: ${BUILD_THREADS}" echo " Number of make threads: ${BUILD_THREADS}"
if [ -n "${CONFIG_OPTIONS}" ]; then if [ -n "${CONFIG_OPTIONS}" ]; then
echo " Configure options: ${CONFIG_OPTIONS}" echo " Configure options: ${CONFIG_OPTIONS}"

2
config/20-ios-tvos-cross.conf
View File

@ -9,7 +9,7 @@
"ios-tvos-cross-base" => { "ios-tvos-cross-base" => {
template => 1, template => 1,
cflags => combine('-isysroot $(CROSS_TOP)/SDKs/$(CROSS_SDK) -fno-common', cflags => combine('-isysroot $(CROSS_TOP)/SDKs/$(CROSS_SDK) -fno-common',
sub { (defined($ENV{'SDKVERSION'}) && $ENV{'SDKVERSION'} =~ /^(9|[1-9][0-9]+)\./ && $disabled{shared}) sub { ((!defined($ENV{'CONFIG_DISABLE_BITCODE'}) || $ENV{'CONFIG_DISABLE_BITCODE'} !~ /true/) && defined($ENV{'SDKVERSION'}) && $ENV{'SDKVERSION'} =~ /^(9|[1-9][0-9]+)\./ && $disabled{shared})
? '-fembed-bitcode' : (); }, ? '-fembed-bitcode' : (); },
), ),
}, },

1
scripts/build-loop-targets.sh
View File

@ -32,6 +32,7 @@ do
export SDKVERSION export SDKVERSION
export IOS_MIN_SDK_VERSION export IOS_MIN_SDK_VERSION
export TVOS_MIN_SDK_VERSION export TVOS_MIN_SDK_VERSION
export CONFIG_DISABLE_BITCODE
# Determine platform # Determine platform
if [[ "${TARGET}" == "ios-sim-cross-"* ]]; then if [[ "${TARGET}" == "ios-sim-cross-"* ]]; then