From 3e1dfa07c0c11bcc9435c9faae3656f4fdeb7aab Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Pueyo Date: Fri, 1 Mar 2013 18:48:44 +0100 Subject: [PATCH] Once again on PHP 5.4.12, fixed krakjoe/pthreads#62 --- compile_php.sh | 7 +++++-- src/config.php | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/compile_php.sh b/compile_php.sh index e9a79635c..0f213d99a 100644 --- a/compile_php.sh +++ b/compile_php.sh @@ -1,7 +1,7 @@ #!/bin/bash COMPILER_VERSION="0.9" -PHP_VERSION="5.4.11" +PHP_VERSION="5.4.12" ZEND_VM="GOTO" ZLIB_VERSION="1.2.7" @@ -129,6 +129,9 @@ fi set -e echo -n " checking..." cd php +rm -rf ./aclocal.m4 >> "$DIR/install.log" 2>&1 +rm -rf ./autom4te.cache/ >> "$DIR/install.log" 2>&1 +rm -f ./configure >> "$DIR/install.log" 2>&1 ./buildconf --force >> "$DIR/install.log" 2>&1 ./configure $OPTIMIZATION--prefix="$DIR/php5" \ --exec-prefix="$DIR/php5" \ @@ -169,4 +172,4 @@ rm -r -f install_data/ >> "$DIR/install.log" 2>&1 date >> "$DIR/install.log" 2>&1 echo " done!" echo "[PocketMine] You should start the server now using \"./start.sh\"" -echo "[PocketMine] If it doesn't works, please send the \"install.log\" file to the Bug Tracker" +echo "[PocketMine] If it doesn't works, please send the \"install.log\" file to the Bug Tracker" \ No newline at end of file diff --git a/src/config.php b/src/config.php index c8c7e8c35..4b6049f62 100644 --- a/src/config.php +++ b/src/config.php @@ -43,4 +43,4 @@ define("CURRENT_STRUCTURE", 5); define("CURRENT_PROTOCOL", 9); define("CURRENT_MINECRAFT_VERSION", "v0.6.1 alpha"); define("CURRENT_API_VERSION", 2); -define("CURRENT_PHP_VERSION", "5.4.11"); \ No newline at end of file +define("CURRENT_PHP_VERSION", "5.4.12"); \ No newline at end of file