cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Let dist-build/ios.sh compile only for iOS and the iOS emulator.

Browse Source
This commit is contained in:
Frank Denis 2015-04-18 18:41:48 +02:00
parent a26a126a51
commit ffc98b37b9
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dist-build/ios.sh
View File

@ -14,12 +14,11 @@ export IOS32_PREFIX="$PREFIX/tmp/ios32"
export IOS64_PREFIX="$PREFIX/tmp/ios64" export IOS64_PREFIX="$PREFIX/tmp/ios64"
export SIMULATOR32_PREFIX="$PREFIX/tmp/simulator32" export SIMULATOR32_PREFIX="$PREFIX/tmp/simulator32"
export SIMULATOR64_PREFIX="$PREFIX/tmp/simulator64" export SIMULATOR64_PREFIX="$PREFIX/tmp/simulator64"
export OSX_PREFIX="$PREFIX/tmp/osx"
export IOS_SIMULATOR_VERSION_MIN=${IOS_SIMULATOR_VERSION_MIN-"5.1.1"} export IOS_SIMULATOR_VERSION_MIN=${IOS_SIMULATOR_VERSION_MIN-"5.1.1"}
export IOS_VERSION_MIN=${IOS_VERSION_MIN-"5.1.1"} export IOS_VERSION_MIN=${IOS_VERSION_MIN-"5.1.1"}
export XCODEDIR=$(xcode-select -p) export XCODEDIR=$(xcode-select -p)
mkdir -p $SIMULATOR32_PREFIX $SIMULATOR64_PREFIX $IOS32_PREFIX $IOS64_PREFIX $OSX_PREFIX || exit 1 mkdir -p $SIMULATOR32_PREFIX $SIMULATOR64_PREFIX $IOS32_PREFIX $IOS64_PREFIX || exit 1
# Build for the simulator # Build for the simulator
export BASEDIR="${XCODEDIR}/Platforms/iPhoneSimulator.platform/Developer" export BASEDIR="${XCODEDIR}/Platforms/iPhoneSimulator.platform/Developer"
@ -50,18 +49,6 @@ make distclean > /dev/null
make -j3 install || exit 1 make -j3 install || exit 1
# Build for OSX
export CFLAGS="-O2 -arch x86_64 -mmacosx-version-min=10.8 -march=core2"
export LDFLAGS="-arch x86_64 -mmacosx-version-min=10.8"
make distclean > /dev/null
./configure --disable-shared \
--enable-minimal \
--prefix="$OSX_PREFIX"
make -j3 check && make install || exit 1
# Build for iOS # Build for iOS
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"
@ -98,7 +85,7 @@ rm -fr -- "$PREFIX/include" "$PREFIX/libsodium.a" 2> /dev/null
mkdir -p -- "$PREFIX" mkdir -p -- "$PREFIX"
lipo -create \ lipo -create \
"$SIMULATOR32_PREFIX/lib/libsodium.a" \ "$SIMULATOR32_PREFIX/lib/libsodium.a" \
"$OSX_PREFIX/lib/libsodium.a" \ "$SIMULATOR64_PREFIX/lib/libsodium.a" \
"$IOS32_PREFIX/lib/libsodium.a" \ "$IOS32_PREFIX/lib/libsodium.a" \
"$IOS64_PREFIX/lib/libsodium.a" \ "$IOS64_PREFIX/lib/libsodium.a" \
-output "$PREFIX/libsodium.a" -output "$PREFIX/libsodium.a"