diff --git a/src/build/compile.sh b/src/build/compile.sh index d76c98197..869dba0ae 100644 --- a/src/build/compile.sh +++ b/src/build/compile.sh @@ -5,10 +5,8 @@ PHP_VERSION="5.4.15" ZEND_VM="GOTO" ZLIB_VERSION="1.2.8" -PTHREADS_VERSION="53eb5d9ee6ec9c00ffa698681ecd132edeb5b8b2" +PTHREADS_VERSION="80b4445eab6ad9b7419afedda41ea4f9a23ab6b8" CURL_VERSION="curl-7_30_0" -LIBEVENT2_VERSION="release-2.0.21-stable" -PHP_EVENT_VERSION="1.6.1" echo "[PocketMine] PHP installer and compiler for Linux & Mac - v$COMPILER_VERSION" DIR="$(pwd)" @@ -73,37 +71,6 @@ cd .. rm -r -f ./curl echo " done!" -#libevent2 -echo -n "[libevent2] downloading $LIBEVENT2_VERSION..." -wget https://github.com/libevent/libevent/archive/$LIBEVENT2_VERSION.tar.gz --no-check-certificate -q -O - | tar -zx >> "$DIR/install.log" 2>&1 -mv libevent-$LIBEVENT2_VERSION libevent2 -echo -n " checking..." -cd libevent2 -libtoolize >> "$DIR/install.log" 2>&1 -set +e -./autogen.sh >> "$DIR/install.log" 2>&1 #Why does this fails for the first time? -set -e -./autogen.sh >> "$DIR/install.log" 2>&1 -automake --add-missing >> "$DIR/install.log" 2>&1 -./configure --prefix="$DIR/install_data/php/ext/libevent2" \ ---disable-openssl \ ---disable-shared >> "$DIR/install.log" 2>&1 -echo -n " compiling..." -make >> "$DIR/install.log" 2>&1 -echo -n " installing..." -make install >> "$DIR/install.log" 2>&1 -echo -n " cleaning..." -cd .. -rm -r -f ./libevent2 -echo " done!" - -#php-event -echo -n "[PHP event] downloading $PHP_EVENT_VERSION..." -wget http://pecl.php.net/get/event-$PHP_EVENT_VERSION.tgz -q -O - | tar -zx >> "$DIR/install.log" 2>&1 -wget https://gist.github.com/shoghicp/5470540/raw/config.m4 --no-check-certificate -q -O event-$PHP_EVENT_VERSION/config.m4 >> "$DIR/install.log" 2>&1 -mv event-$PHP_EVENT_VERSION "$DIR/install_data/php/ext/event" -echo " done!" - #pthreads echo -n "[PHP pthreads] downloading $PTHREADS_VERSION..." wget https://github.com/krakjoe/pthreads/archive/$PTHREADS_VERSION.tar.gz --no-check-certificate -q -O - | tar -zx >> "$DIR/install.log" 2>&1 @@ -136,11 +103,6 @@ rm -f ./configure >> "$DIR/install.log" 2>&1 --exec-prefix="$DIR/php5" \ --with-curl="$DIR/install_data/php/ext/curl" \ --with-zlib="$DIR/install_data/php/ext/zlib" \ ---with-event-core="$DIR/install_data/php/ext/event" \ ---with-event-pthreads \ ---with-event-extra=no \ ---with-event-openssl=no \ ---with-event-libevent-dir="$DIR/install_data/php/ext/libevent2" \ --disable-libxml \ --disable-xml \ --disable-dom \