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

Merge pull request #57 from x2on/bitcode-support 

Add support for bitcode #Fixes 56
This commit is contained in:
Felix Schulze 2015-08-06 21:36:35 +02:00
parent a57b7795b7 a8982557cc
commit f02823aceb
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -14,6 +14,8 @@ This repository contains a iOS 8.4 XCode Project with usese the OpenSSL Libaries
## System support ## System support
**iOS 4.3 - iOS 9.0 (i386, x86_64, armv7, armv7s, armv64) is currently supported.** **iOS 4.3 - iOS 9.0 (i386, x86_64, armv7, armv7s, armv64) is currently supported.**
**If you build with Xcode 7 Bitcode support is enabled. This is only supported by iOS 8/9**
For iOS < 4.3 you must use iOS SDK < 6.0 and an older version of the build script. For iOS < 4.3 you must use iOS SDK < 6.0 and an older version of the build script.
If you have problems building for arm64 please uninstall MacPorts (see #28). If you have problems building for arm64 please uninstall MacPorts (see #28).
@ -23,6 +25,7 @@ If you have problems building for arm64 please uninstall MacPorts (see #28).
* <http://www.x2on.de/2010/07/13/tutorial-iphone-app-with-compiled-openssl-1-0-0a-library/> * <http://www.x2on.de/2010/07/13/tutorial-iphone-app-with-compiled-openssl-1-0-0a-library/>
## Changelog ## Changelog
* 2015-08-06: iOS 9.0 support, Bitcode support
* 2015-07-09: OpenSSL 1.0.2d, iOS 8.4 * 2015-07-09: OpenSSL 1.0.2d, iOS 8.4
* 2015-06-15: OpenSSL 1.0.2c, iOS 8.3 * 2015-06-15: OpenSSL 1.0.2c, iOS 8.3
* 2015-06-11: OpenSSL 1.0.2b * 2015-06-11: OpenSSL 1.0.2b

19
build-libssl.sh
View File

@ -35,6 +35,12 @@ CURRENTPATH=`pwd`
ARCHS="i386 x86_64 armv7 armv7s arm64" ARCHS="i386 x86_64 armv7 armv7s arm64"
DEVELOPER=`xcode-select -print-path` DEVELOPER=`xcode-select -print-path`
if [ "${SDKVERSION}" == "9.0" ]; then
MIN_SDK_VERSION="8.0"
else
MIN_SDK_VERSION="7.0"
fi
if [ ! -d "$DEVELOPER" ]; then if [ ! -d "$DEVELOPER" ]; then
echo "xcode path is not set correctly $DEVELOPER does not exist (most likely because of xcode > 4.3)" echo "xcode path is not set correctly $DEVELOPER does not exist (most likely because of xcode > 4.3)"
echo "run" echo "run"
@ -91,15 +97,18 @@ do
echo "Building openssl-${VERSION} for ${PLATFORM} ${SDKVERSION} ${ARCH}" echo "Building openssl-${VERSION} for ${PLATFORM} ${SDKVERSION} ${ARCH}"
echo "Please stand by..." echo "Please stand by..."
if [ "${SDKVERSION}" == "9.0" ]; then
export CC="${BUILD_TOOLS}/usr/bin/gcc -arch ${ARCH} -fembed-bitcode"
else
export CC="${BUILD_TOOLS}/usr/bin/gcc -arch ${ARCH}" export CC="${BUILD_TOOLS}/usr/bin/gcc -arch ${ARCH}"
fi
mkdir -p "${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" mkdir -p "${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk"
LOG="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk/build-openssl-${VERSION}.log" LOG="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk/build-openssl-${VERSION}.log"
set +e set +e
if [[ "$VERSION" =~ 1.0.0. ]]; then if [ "${ARCH}" == "x86_64" ]; then
./Configure BSD-generic32 --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" > "${LOG}" 2>&1 ./Configure no-asm darwin64-x86_64-cc --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" > "${LOG}" 2>&1
elif [ "${ARCH}" == "x86_64" ]; then
./Configure darwin64-x86_64-cc --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" > "${LOG}" 2>&1
else else
./Configure iphoneos-cross --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" > "${LOG}" 2>&1 ./Configure iphoneos-cross --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" > "${LOG}" 2>&1
fi fi
@ -111,7 +120,7 @@ do
fi fi
# add -isysroot to CC= # add -isysroot to CC=
sed -ie "s!^CFLAG=!CFLAG=-isysroot ${CROSS_TOP}/SDKs/${CROSS_SDK} -miphoneos-version-min=7.0 !" "Makefile" sed -ie "s!^CFLAG=!CFLAG=-isysroot ${CROSS_TOP}/SDKs/${CROSS_SDK} -miphoneos-version-min=${MIN_SDK_VERSION} !" "Makefile"
if [ "$1" == "verbose" ]; if [ "$1" == "verbose" ];
then then