mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-09 11:31:49 +00:00
Code Issues Projects Releases Wiki Activity

Disabled phar cmdtools generation on crosscompile

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-03-07 19:12:06 +01:00
parent 47ad8b6fac
commit 5ad511cd11
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/build/compile.sh
View File

@ -94,8 +94,6 @@ while getopts "t:oj:cxf::" OPTION; do
done done
if [ "$IS_CROSSCOMPILE" == "yes" ]; then if [ "$IS_CROSSCOMPILE" == "yes" ]; then
export PHP_VAR_NAME="php"
export php_var_name="php"
if [ "$COMPILE_TARGET" == "android" ] || [ "$COMPILE_TARGET" == "android-armv6" ]; then if [ "$COMPILE_TARGET" == "android" ] || [ "$COMPILE_TARGET" == "android-armv6" ]; then
COMPILE_FOR_ANDROID=yes COMPILE_FOR_ANDROID=yes
[ -z "$march" ] && march=armv6; [ -z "$march" ] && march=armv6;
@ -431,7 +429,7 @@ rm -rf ./autom4te.cache/ >> "$DIR/install.log" 2>&1
rm -f ./configure >> "$DIR/install.log" 2>&1 rm -f ./configure >> "$DIR/install.log" 2>&1
./buildconf --force >> "$DIR/install.log" 2>&1 ./buildconf --force >> "$DIR/install.log" 2>&1
if [ "$IS_CROSSCOMPILE" == "yes" ]; then if [ "$IS_CROSSCOMPILE" == "yes" ]; then
sed -i ".backup" 's/pthreads_working=no/pthreads_working=yes/' ./configure sed -i=".backup" 's/pthreads_working=no/pthreads_working=yes/' ./configure
export LIBS="-lpthread -ldl -lresolv" export LIBS="-lpthread -ldl -lresolv"
CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-opcache=no" CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-opcache=no"
fi fi
@ -472,8 +470,12 @@ $HAVE_MYSQLI \
--with-zend-vm=$ZEND_VM \ --with-zend-vm=$ZEND_VM \
$CONFIGURE_FLAGS >> "$DIR/install.log" 2>&1 $CONFIGURE_FLAGS >> "$DIR/install.log" 2>&1
echo -n " compiling..." echo -n " compiling..."
if [ $COMPILE_FOR_ANDROID == "yes" ]; then if [ "$COMPILE_FOR_ANDROID" == "yes" ]; then
sed -i ".backup" 's/-export-dynamic/-all-static/g' Makefile sed -i=".backup" 's/-export-dynamic/-all-static/g' Makefile
fi
if [ "$IS_CROSSCOMPILE" == "yes" ]; then
sed -i=".backup" 's/PHP_BINARIES. pharcmd$/PHP_BINARIES)/g' Makefile
sed -i=".backup" 's/install-programs install-pharcmd$/install-programs/g' Makefile
fi fi
make -j $THREADS >> "$DIR/install.log" 2>&1 make -j $THREADS >> "$DIR/install.log" 2>&1
echo -n " installing..." echo -n " installing..."