Allow build of subset of archs: make lipo arguments dynamic and copy include files from first built ARCH
This commit is contained in:
Anton Tieleman
parent
762bbc82d4
commit
0f2afa24af
|
|
@ -51,7 +51,7 @@ spinner()
|
|||
}
|
||||
|
||||
CURRENTPATH=`pwd`
|
||||
ARCHS="i386 x86_64 armv7 armv7s arm64 tv_x86_64 tv_arm64"
|
||||
ARCHS="x86_64 i386 arm64 armv7s armv7 tv_x86_64 tv_arm64"
|
||||
DEVELOPER=`xcode-select -print-path`
|
||||
IOS_MIN_SDK_VERSION="7.0"
|
||||
TVOS_MIN_SDK_VERSION="9.0"
|
||||
|
|
@ -93,6 +93,13 @@ mkdir -p "${CURRENTPATH}/src"
|
|||
mkdir -p "${CURRENTPATH}/bin"
|
||||
mkdir -p "${CURRENTPATH}/lib"
|
||||
|
||||
# Init vars for library references
|
||||
INCLUDE_DIR=""
|
||||
LIBSSL_IOS=()
|
||||
LIBCRYPTO_IOS=()
|
||||
LIBSSL_TVOS=()
|
||||
LIBCRYPTO_TVOS=()
|
||||
|
||||
for ARCH in ${ARCHS}
|
||||
do
|
||||
if [[ "$ARCH" == tv* ]]; then
|
||||
|
|
@ -120,11 +127,14 @@ do
|
|||
export CROSS_SDK="${PLATFORM}${SDKVERSION}.sdk"
|
||||
export BUILD_TOOLS="${DEVELOPER}"
|
||||
|
||||
mkdir -p "${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk"
|
||||
LOG="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk/build-openssl-${VERSION}.log"
|
||||
# Prepare target dir
|
||||
TARGETDIR="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk"
|
||||
mkdir -p "${TARGETDIR}"
|
||||
LOG="${TARGETDIR}/build-openssl-${VERSION}.log"
|
||||
|
||||
echo "Building openssl-${VERSION} for ${PLATFORM} ${SDKVERSION} ${ARCH}..."
|
||||
echo " Logfile: ${LOG}"
|
||||
|
||||
echo "Building openssl-${VERSION} for ${PLATFORM} ${SDKVERSION} ${ARCH}"
|
||||
echo " Logfile: $LOG"
|
||||
|
||||
LOCAL_CONFIG_OPTIONS="${CONFIG_OPTIONS}"
|
||||
if [ "${ENABLE_EC_NISTP_64_GCC_128}" == "true" ]; then
|
||||
|
|
@ -164,15 +174,15 @@ do
|
|||
set +e
|
||||
if [ "$1" == "verbose" ]; then
|
||||
if [ "${ARCH}" == "x86_64" ]; then
|
||||
./Configure no-asm darwin64-x86_64-cc --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" ${LOCAL_CONFIG_OPTIONS}
|
||||
./Configure no-asm darwin64-x86_64-cc --openssldir="${TARGETDIR}" ${LOCAL_CONFIG_OPTIONS}
|
||||
else
|
||||
./Configure iphoneos-cross --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" ${LOCAL_CONFIG_OPTIONS}
|
||||
./Configure iphoneos-cross --openssldir="${TARGETDIR}" ${LOCAL_CONFIG_OPTIONS}
|
||||
fi
|
||||
else
|
||||
if [ "${ARCH}" == "x86_64" ]; then
|
||||
(./Configure no-asm darwin64-x86_64-cc --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" ${LOCAL_CONFIG_OPTIONS} > "${LOG}" 2>&1) & spinner
|
||||
(./Configure no-asm darwin64-x86_64-cc --openssldir="${TARGETDIR}" ${LOCAL_CONFIG_OPTIONS} > "${LOG}" 2>&1) & spinner
|
||||
else
|
||||
(./Configure iphoneos-cross --openssldir="${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk" ${LOCAL_CONFIG_OPTIONS} > "${LOG}" 2>&1) & spinner
|
||||
(./Configure iphoneos-cross --openssldir="${TARGETDIR}" ${LOCAL_CONFIG_OPTIONS} > "${LOG}" 2>&1) & spinner
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -219,35 +229,37 @@ do
|
|||
fi
|
||||
|
||||
rm -rf "$src_work_dir"
|
||||
|
||||
# Add references to library files to relevant arrays
|
||||
if [[ "${PLATFORM}" == AppleTV* ]]; then
|
||||
LIBSSL_TVOS+=("${TARGETDIR}/lib/libssl.a")
|
||||
LIBCRYPTO_TVOS+=("${TARGETDIR}/lib/libcrypto.a")
|
||||
else
|
||||
LIBSSL_IOS+=("${TARGETDIR}/lib/libssl.a")
|
||||
LIBCRYPTO_IOS+=("${TARGETDIR}/lib/libcrypto.a")
|
||||
fi
|
||||
|
||||
# Keep reference to first build target for include file
|
||||
if [ -z "${INCLUDE_DIR}" ]; then
|
||||
INCLUDE_DIR="${TARGETDIR}/include/openssl"
|
||||
fi
|
||||
done
|
||||
|
||||
echo "Build library for iOS..."
|
||||
lipo -create \
|
||||
${CURRENTPATH}/bin/iPhoneSimulator${IOS_SDKVERSION}-i386.sdk/lib/libssl.a \
|
||||
${CURRENTPATH}/bin/iPhoneSimulator${IOS_SDKVERSION}-x86_64.sdk/lib/libssl.a \
|
||||
${CURRENTPATH}/bin/iPhoneOS${IOS_SDKVERSION}-armv7.sdk/lib/libssl.a \
|
||||
${CURRENTPATH}/bin/iPhoneOS${IOS_SDKVERSION}-armv7s.sdk/lib/libssl.a \
|
||||
${CURRENTPATH}/bin/iPhoneOS${IOS_SDKVERSION}-arm64.sdk/lib/libssl.a \
|
||||
-output ${CURRENTPATH}/lib/libssl.a
|
||||
lipo -create \
|
||||
${CURRENTPATH}/bin/iPhoneSimulator${IOS_SDKVERSION}-i386.sdk/lib/libcrypto.a \
|
||||
${CURRENTPATH}/bin/iPhoneSimulator${IOS_SDKVERSION}-x86_64.sdk/lib/libcrypto.a \
|
||||
${CURRENTPATH}/bin/iPhoneOS${IOS_SDKVERSION}-armv7.sdk/lib/libcrypto.a \
|
||||
${CURRENTPATH}/bin/iPhoneOS${IOS_SDKVERSION}-armv7s.sdk/lib/libcrypto.a \
|
||||
${CURRENTPATH}/bin/iPhoneOS${IOS_SDKVERSION}-arm64.sdk/lib/libcrypto.a \
|
||||
-output ${CURRENTPATH}/lib/libcrypto.a
|
||||
# Build iOS library if selected for build
|
||||
if [ ${#LIBSSL_IOS} -gt 0 ]; then
|
||||
echo "Build library for iOS..."
|
||||
lipo -create ${LIBSSL_IOS[@]} -output "${CURRENTPATH}/lib/libssl.a"
|
||||
lipo -create ${LIBCRYPTO_IOS[@]} -output "${CURRENTPATH}/lib/libcrypto.a"
|
||||
fi
|
||||
|
||||
echo "Build library for tvOS..."
|
||||
lipo -create \
|
||||
${CURRENTPATH}/bin/AppleTVSimulator${TVOS_SDKVERSION}-x86_64.sdk/lib/libssl.a \
|
||||
${CURRENTPATH}/bin/AppleTVOS${TVOS_SDKVERSION}-arm64.sdk/lib/libssl.a \
|
||||
-output ${CURRENTPATH}/lib/libssl-tvOS.a
|
||||
lipo -create \
|
||||
${CURRENTPATH}/bin/AppleTVSimulator${TVOS_SDKVERSION}-x86_64.sdk/lib/libcrypto.a \
|
||||
${CURRENTPATH}/bin/AppleTVOS${TVOS_SDKVERSION}-arm64.sdk/lib/libcrypto.a \
|
||||
-output ${CURRENTPATH}/lib/libcrypto-tvOS.a
|
||||
# Build tvOS library if selected for build
|
||||
if [ ${#LIBSSL_TVOS} -gt 0 ] ; then
|
||||
echo "Build library for tvOS..."
|
||||
lipo -create ${LIBSSL_TVOS[@]} -output "${CURRENTPATH}/lib/libssl-tvOS.a"
|
||||
lipo -create ${LIBCRYPTO_TVOS[@]} -output "${CURRENTPATH}/lib/libcrypto-tvOS.a"
|
||||
fi
|
||||
|
||||
mkdir -p ${CURRENTPATH}/include
|
||||
cp -R ${CURRENTPATH}/bin/iPhoneSimulator${IOS_SDKVERSION}-x86_64.sdk/include/openssl ${CURRENTPATH}/include/
|
||||
# Copy include directory
|
||||
cp -R "${INCLUDE_DIR}" ${CURRENTPATH}/include/
|
||||
|
||||
echo "Done."
|
||||
|
|
|
|||
Loading…
Reference in New Issue