mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-09 21:24:53 +00:00
Code Issues Projects Releases Wiki Activity

Fixed MySQLnd cross-compilation

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-04-04 15:50:13 +02:00
parent 5c8747cb87
commit ddf59b8bee
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/build/compile.sh
View File

@ -137,7 +137,6 @@ if [ "$IS_CROSSCOMPILE" == "yes" ]; then
CFLAGS="-static -uclibc -Wl,-Bdynamic $CFLAGS" CFLAGS="-static -uclibc -Wl,-Bdynamic $CFLAGS"
echo "[INFO] Cross-compiling for Android ARMv6" echo "[INFO] Cross-compiling for Android ARMv6"
OPENSSL_TARGET="android" OPENSSL_TARGET="android"
HAVE_MYSQLI="--without-mysqli"
elif [ "$COMPILE_TARGET" == "android-armv7" ]; then elif [ "$COMPILE_TARGET" == "android-armv7" ]; then
COMPILE_FOR_ANDROID=yes COMPILE_FOR_ANDROID=yes
[ -z "$march" ] && march=armv7-a; [ -z "$march" ] && march=armv7-a;
@ -148,7 +147,6 @@ if [ "$IS_CROSSCOMPILE" == "yes" ]; then
CFLAGS="-static -uclibc -Wl,-Bdynamic $CFLAGS" CFLAGS="-static -uclibc -Wl,-Bdynamic $CFLAGS"
echo "[INFO] Cross-compiling for Android ARMv7" echo "[INFO] Cross-compiling for Android ARMv7"
OPENSSL_TARGET="android-armv7" OPENSSL_TARGET="android-armv7"
HAVE_MYSQLI="--without-mysqli"
elif [ "$COMPILE_TARGET" == "rpi" ]; then elif [ "$COMPILE_TARGET" == "rpi" ]; then
TOOLCHAIN_PREFIX="arm-linux-gnueabihf" TOOLCHAIN_PREFIX="arm-linux-gnueabihf"
[ -z "$march" ] && march=armv6zk; [ -z "$march" ] && march=armv6zk;
@ -182,7 +180,6 @@ if [ "$IS_CROSSCOMPILE" == "yes" ]; then
export CC="$TOOLCHAIN_PREFIX-gcc" export CC="$TOOLCHAIN_PREFIX-gcc"
CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX --target=$TOOLCHAIN_PREFIX -miphoneos-version-min=4.2" CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX --target=$TOOLCHAIN_PREFIX -miphoneos-version-min=4.2"
OPENSSL_TARGET="BSD-generic32" OPENSSL_TARGET="BSD-generic32"
HAVE_MYSQLI="--without-mysqli"
elif [ "$COMPILE_TARGET" == "ios-armv7" ]; then elif [ "$COMPILE_TARGET" == "ios-armv7" ]; then
[ -z "$march" ] && march=armv7-a; [ -z "$march" ] && march=armv7-a;
[ -z "$mtune" ] && mtune=cortex-a8; [ -z "$mtune" ] && mtune=cortex-a8;
@ -190,7 +187,6 @@ if [ "$IS_CROSSCOMPILE" == "yes" ]; then
export CC="$TOOLCHAIN_PREFIX-gcc" export CC="$TOOLCHAIN_PREFIX-gcc"
CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX --target=$TOOLCHAIN_PREFIX -miphoneos-version-min=4.2" CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX --target=$TOOLCHAIN_PREFIX -miphoneos-version-min=4.2"
OPENSSL_TARGET="BSD-generic32" OPENSSL_TARGET="BSD-generic32"
HAVE_MYSQLI="--without-mysqli"
if [ "$DO_OPTIMIZE" == "yes" ]; then if [ "$DO_OPTIMIZE" == "yes" ]; then
CFLAGS="$CFLAGS -mfpu=neon" CFLAGS="$CFLAGS -mfpu=neon"
fi fi
@ -614,6 +610,8 @@ if [ "$IS_CROSSCOMPILE" == "yes" ]; then
else else
export LIBS="$LIBS -lpthread" export LIBS="$LIBS -lpthread"
fi fi
mv ext/mysqlnd/config9.m4 ext/mysqlnd/config.m4
sed -i=".backup" "s{ext/mysqlnd/php_mysqlnd_config.h{config.h{" ext/mysqlnd/mysqlnd_portability.h
CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-opcache=no" CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-opcache=no"
fi fi