From 11593ac96c819e518d606b9723643e244dd9fdb4 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Sun, 2 Feb 2014 19:02:29 +0100 Subject: [PATCH] Added experimental iOS cross-compile support --- src/build/compile.sh | 14 +++++++++++++- src/build/jenkins.sh | 26 ++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/src/build/compile.sh b/src/build/compile.sh index 8f11b7c7c..b95a0a825 100755 --- a/src/build/compile.sh +++ b/src/build/compile.sh @@ -93,8 +93,20 @@ elif [ "$1" == "crosscompile" ]; then #zlib doesn't use the correct ranlib RANLIB=$TOOLCHAIN_PREFIX-ranlib echo "[INFO] Cross-compiling for Intel MacOS" + elif [ "$2" == "ios" ] || [ "$2" == "ios-armv6" ]; then + [ -z "$march" ] && march=armv6; + [ -z "$mtune" ] && mtune=generic-armv6; + TOOLCHAIN_PREFIX="arm-apple-darwin10" + export CC="$TOOLCHAIN_PREFIX-gcc" + CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX" + elif [ "$2" == "ios-armv7" ]; then + [ -z "$march" ] && march=armv7-a; + [ -z "$mtune" ] && mtune=generic-armv7-a; + TOOLCHAIN_PREFIX="arm-apple-darwin10" + export CC="$TOOLCHAIN_PREFIX-gcc" + CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX" else - echo "Please supply a proper platform [android android-armv6 android-armv7 rpi mac] to cross-compile" + echo "Please supply a proper platform [android android-armv6 android-armv7 rpi mac ios ios-armv6 ios-armv7] to cross-compile" exit 1 fi elif [ -z "$CFLAGS" ]; then diff --git a/src/build/jenkins.sh b/src/build/jenkins.sh index 4ad1916da..0c46cf8d9 100644 --- a/src/build/jenkins.sh +++ b/src/build/jenkins.sh @@ -113,6 +113,32 @@ then fi fi +if [ "$CROSSCOMPILE_IOS_ARMV6" = "true" ]; +then + mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/ios-armv6 + cd $COMPILEDIR/crosscompile/ios-armv6 + + $SCRIPT crosscompile ios-armv6 + + cp -r $COMPILEDIR/crosscompile/ios-armv6/{install.log,bin/*,install_data/*} $ARCHIVE/crosscompile/ios-armv6/ + if [ ! -f $COMPILEDIR/crosscompile/ios-armv6/bin/php5/bin/php ]; then + exit 1 + fi +fi + +if [ "$CROSSCOMPILE_IOS_ARMV7" = "true" ]; +then + mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/ios-armv7 + cd $COMPILEDIR/crosscompile/ios-armv7 + + $SCRIPT crosscompile ios-armv7 + + cp -r $COMPILEDIR/crosscompile/ios-armv7/{install.log,bin/*,install_data/*} $ARCHIVE/crosscompile/ios-armv7/ + if [ ! -f $COMPILEDIR/crosscompile/ios-armv7/bin/php5/bin/php ]; then + exit 1 + fi +fi + if [ "$CROSSCOMPILE_RPI" = "true" ]; then mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/rpi