mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-17 11:18:52 +00:00
Code Issues Projects Releases Wiki Activity

OpenSSL is now not enforced compile.sh

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-02-17 01:46:28 +01:00
parent 6b2bca10a3
commit 98c50f9a9c
1 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/build/compile.sh
View File

@ -224,31 +224,36 @@ cd ..
rm -r -f ./zlib rm -r -f ./zlib
echo " done!" echo " done!"
#OpenSSL if [ "$2" == "openssl" ]; then
echo -n "[OpenSSL] downloading $OPENSSL_VERSION..." #OpenSSL
download_file "http://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz" | tar -zx >> "$DIR/install.log" 2>&1 WITH_OPENSSL="--with-ssl=$DIR/install_data/php/ext/openssl"
mv openssl-$OPENSSL_VERSION openssl echo -n "[OpenSSL] downloading $OPENSSL_VERSION..."
echo -n " checking..." download_file "http://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz" | tar -zx >> "$DIR/install.log" 2>&1
cd openssl mv openssl-$OPENSSL_VERSION openssl
RANLIB=$RANLIB ./Configure \ echo -n " checking..."
$OPENSSL_TARGET \ cd openssl
--prefix="$DIR/install_data/php/ext/openssl" \ RANLIB=$RANLIB ./Configure \
--openssldir="$DIR/install_data/php/ext/openssl" \ $OPENSSL_TARGET \
no-zlib \ --prefix="$DIR/install_data/php/ext/openssl" \
no-shared \ --openssldir="$DIR/install_data/php/ext/openssl" \
no-asm \ no-zlib \
no-hw \ no-shared \
no-engines \ no-asm \
$CONFIGURE_FLAGS >> "$DIR/install.log" 2>&1 no-hw \
echo -n " compiling..." no-engines \
make depend >> "$DIR/install.log" 2>&1 $CONFIGURE_FLAGS >> "$DIR/install.log" 2>&1
make >> "$DIR/install.log" 2>&1 echo -n " compiling..."
echo -n " installing..." make depend >> "$DIR/install.log" 2>&1
make install >> "$DIR/install.log" 2>&1 make >> "$DIR/install.log" 2>&1
echo -n " cleaning..." echo -n " installing..."
cd .. make install >> "$DIR/install.log" 2>&1
rm -r -f ./openssh echo -n " cleaning..."
echo " done!" cd ..
rm -r -f ./openssh
echo " done!"
else
WITH_OPENSSL="--with-ssl"
fi
if [ "$(uname -s)" == "Darwin" ] && [ "$1" != "crosscompile" ] && [ "$2" != "curl" ]; then if [ "$(uname -s)" == "Darwin" ] && [ "$1" != "crosscompile" ] && [ "$2" != "curl" ]; then
HAVE_CURL="shared,/usr" HAVE_CURL="shared,/usr"
@ -280,7 +285,7 @@ else
--disable-ldaps \ --disable-ldaps \
--without-libidn \ --without-libidn \
--with-zlib="$DIR/install_data/php/ext/zlib" \ --with-zlib="$DIR/install_data/php/ext/zlib" \
--with-ssl="static,$DIR/install_data/php/ext/openssl" \ $WITH_OPENSSL \
--enable-threaded-resolver \ --enable-threaded-resolver \
--prefix="$DIR/install_data/php/ext/curl" \ --prefix="$DIR/install_data/php/ext/curl" \
--disable-shared \ --disable-shared \