mirror of
https://github.com/jedisct1/libsodium.git
synced 2024-12-20 10:37:24 -07:00
Merge pull request #218 from JackWink/feature/jack/update-ios-build
iOS.sh: Update script to include arm64 and current OSX architecture in generated libsodium.a
This commit is contained in:
commit
d38d5167e4
@ -1,18 +1,49 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
|
#
|
||||||
|
# Step 1.
|
||||||
|
# Configure for base system so simulator is covered
|
||||||
|
#
|
||||||
|
# Step 2.
|
||||||
|
# Make for iOS arm7 and arm64
|
||||||
|
#
|
||||||
|
# Step 3.
|
||||||
|
# Merge libs into final version for xcode import
|
||||||
|
|
||||||
|
export PREFIX="$(pwd)/libsodium-ios"
|
||||||
|
export IOS_PREFIX="$PREFIX/tmp/osx"
|
||||||
|
export OSX_PREFIX="$PREFIX/tmp/ios"
|
||||||
|
|
||||||
|
mkdir -p $IOS_PREFIX && mkdir -p $OSX_PREFIX
|
||||||
|
|
||||||
|
# Build for OSX First
|
||||||
|
|
||||||
|
./configure --prefix="$OSX_PREFIX"
|
||||||
|
make clean && make -j3 install
|
||||||
|
|
||||||
|
# Cleanup
|
||||||
|
rm Makefile
|
||||||
|
|
||||||
|
# Build for iOS
|
||||||
|
|
||||||
export XCODEDIR=$(xcode-select -p)
|
export XCODEDIR=$(xcode-select -p)
|
||||||
export BASEDIR="${XCODEDIR}/Platforms/iPhoneOS.platform/Developer"
|
export BASEDIR="${XCODEDIR}/Platforms/iPhoneOS.platform/Developer"
|
||||||
export PATH="${BASEDIR}/usr/bin:$BASEDIR/usr/sbin:$PATH"
|
export PATH="${BASEDIR}/usr/bin:$BASEDIR/usr/sbin:$PATH"
|
||||||
export SDK="${BASEDIR}/SDKs/iPhoneOS.sdk"
|
export SDK="${BASEDIR}/SDKs/iPhoneOS.sdk"
|
||||||
export IPHONEOS_VERSION_MIN="5.1.1"
|
export IPHONEOS_VERSION_MIN="5.1.1"
|
||||||
export CFLAGS="-Oz -mthumb -arch armv7 -isysroot ${SDK} -miphoneos-version-min=${IPHONEOS_VERSION_MIN}"
|
export CFLAGS="-Oz -mthumb -arch armv7 -arch arm64 -isysroot ${SDK} -miphoneos-version-min=${IPHONEOS_VERSION_MIN}"
|
||||||
export LDFLAGS="-mthumb -arch armv7 -isysroot ${SDK} -miphoneos-version-min=${IPHONEOS_VERSION_MIN}"
|
export LDFLAGS="-mthumb -arch armv7 -arch arm64 -isysroot ${SDK} -miphoneos-version-min=${IPHONEOS_VERSION_MIN}"
|
||||||
export PREFIX="$(pwd)/libsodium-ios"
|
|
||||||
|
|
||||||
./configure --host=arm-apple-darwin10 \
|
./configure --host=arm-apple-darwin10 \
|
||||||
--disable-shared \
|
--disable-shared \
|
||||||
--enable-minimal \
|
--enable-minimal \
|
||||||
--prefix="$PREFIX" && \
|
--prefix="$IOS_PREFIX"
|
||||||
make clean && \
|
|
||||||
make -j3 install && \
|
make clean && make -j3 install
|
||||||
echo "libsodium has been installed into $PREFIX"
|
|
||||||
|
# Create universal binary and include folder
|
||||||
|
lipo -create "$IOS_PREFIX/lib/libsodium.a" "$OSX_PREFIX/lib/libsodium.a" -output "$PREFIX/libsodium.a"
|
||||||
|
cp -r "$IOS_PREFIX/include" "$PREFIX/include"
|
||||||
|
|
||||||
|
# Cleanup
|
||||||
|
rm -rf "$PREFIX/tmp"
|
||||||
|
rm Makefile
|
||||||
|
Loading…
Reference in New Issue
Block a user