diff --git a/src/build/compile.sh b/src/build/compile.sh index 335189fd7..5ae305ddf 100755 --- a/src/build/compile.sh +++ b/src/build/compile.sh @@ -47,7 +47,7 @@ COMPILE_CURL="default" COMPILE_LIBEDIT="no" IS_CROSSCOMPILE="no" DO_OPTIMIZE="no" -while getopts "t:oj:cxf" OPTION; do +while getopts "t:oj:cxf::" OPTION; do case $OPTION in t) echo "[opt] Set target to $OPTARG" @@ -77,7 +77,12 @@ while getopts "t:oj:cxf" OPTION; do echo "[opt] Enabling abusive optimizations..." DO_OPTIMIZE="yes" FAST_MATH="-fno-math-errno -funsafe-math-optimizations -fno-trapping-math -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fcx-limited-range" #workaround SQLite3 fail - CFLAGS="$CFLAGS -O2 -DSQLITE_HAVE_ISNAN $FAST_MATH -finline-functions -funsafe-loop-optimizations -fomit-frame-pointer -frename-registers -funroll-loops -funswitch-loops -fpredictive-commoning -fgcse-after-reload -ftree-vectorize -msse2 -ftracer -mfpmath=sse -ftree-loop-im -fprefetch-loop-arrays -ftree-parallelize-loops=4" + CFLAGS="$CFLAGS -O2 -DSQLITE_HAVE_ISNAN $FAST_MATH -finline-functions -funsafe-loop-optimizations -fomit-frame-pointer -frename-registers -funroll-loops -funswitch-loops -fpredictive-commoning -fgcse-after-reload -ftree-vectorize -ftracer -ftree-loop-im -fprefetch-loop-arrays -ftree-parallelize-loops=4" + if [ "$OPTARG" == "arm" ]; then + CFLAGS="$CFLAGS -mfloat-abi=softfp -mfpu=vfp -fomit-frame-pointer" + else + CFLAGS="$CFLAGS -msse2 -mfpmath=sse" + fi ;; \?) echo "Invalid option: -$OPTION$OPTARG" >&2 diff --git a/src/build/jenkins.sh b/src/build/jenkins.sh index 47c893383..458c8c066 100644 --- a/src/build/jenkins.sh +++ b/src/build/jenkins.sh @@ -21,11 +21,11 @@ rm -rf $WORKSPACE/compile.sh download_file "https://github.com/PocketMine/PocketMine-MP/raw/master/src/build/compile.sh" > $WORKSPACE/compile.sh chmod +x $WORKSPACE/compile.sh SCRIPT="$WORKSPACE/compile.sh" -ARCHIVE=$WORKSPACE/archive -COMPILEDIR=$WORKSPACE/compile -rm -rf $ARCHIVE $COMPILEDIR -mkdir -p $ARCHIVE -mkdir -p $COMPILEDIR +ARCHIVE="$WORKSPACE/archive" +COMPILEDIR="$WORKSPACE/compile" +rm -rf "$ARCHIVE" "$COMPILEDIR" +mkdir -p "$ARCHIVE" +mkdir -p "$COMPILEDIR" if [ "$COMPILE_LINUX_32BIT" = "true" ]; then @@ -106,7 +106,7 @@ then mkdir -p {$COMPILEDIR,$ARCHIVE}/rpi cd $COMPILEDIR/rpi - $SCRIPT -t rpi -o -j 1 -c + $SCRIPT -t rpi -o -j 1 -c -f arm tar -czf PHP_${PHP_VERSION}_ARM_Raspbian_hard.tar.gz bin/ cp -r $COMPILEDIR/rpi/{install.log,PHP_${PHP_VERSION}_ARM_Raspbian_hard.tar.gz,install_data/*} $ARCHIVE/rpi/ @@ -120,7 +120,7 @@ then mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/android-armv6 cd $COMPILEDIR/crosscompile/android-armv6 - $SCRIPT -t android-armv6 -o -j 1 -c -x + $SCRIPT -t android-armv6 -o -j 1 -c -x -f arm tar -czf PHP_${PHP_VERSION}_ARMv6_Android.tar.gz bin/ cp -r $COMPILEDIR/crosscompile/android-armv6/{install.log,PHP_${PHP_VERSION}_ARMv6_Android.tar.gz,install_data/*} $ARCHIVE/crosscompile/android-armv6/ @@ -134,7 +134,7 @@ then mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/android-armv7 cd $COMPILEDIR/crosscompile/android-armv7 - $SCRIPT -t android-armv7 -o -j 1 -c -x + $SCRIPT -t android-armv7 -o -j 1 -c -x -f arm tar -czf PHP_${PHP_VERSION}_ARMv7_Android.tar.gz bin/ cp -r $COMPILEDIR/crosscompile/android-armv7/{install.log,PHP_${PHP_VERSION}_ARMv7_Android.tar.gz,install_data/*} $ARCHIVE/crosscompile/android-armv7/ @@ -190,8 +190,8 @@ then mkdir -p {$COMPILEDIR,$ARCHIVE}/crosscompile/rpi cd $COMPILEDIR/crosscompile/rpi - $SCRIPT -t rpi -o -j 1 -c -x - + $SCRIPT -t rpi -o -j 1 -c -x -f arm + tar -czf PHP_${PHP_VERSION}_ARM_Raspbian_hard.tar.gz bin/ cp -r $COMPILEDIR/crosscompile/rpi/{install.log,PHP_${PHP_VERSION}_ARM_Raspbian_hard.tar.gz,install_data/*} $ARCHIVE/crosscompile/rpi/ if [ ! -f $COMPILEDIR/crosscompile/rpi/bin/php5/bin/php ]; then