Эх сурвалжийг харах

Build php with existing system openssl resources.

Raphael Schneeberger 4 жил өмнө
parent
commit
32a68563ae

+ 4 - 9
src/hst_autocompile.sh

@@ -459,22 +459,18 @@ if [ "$PHP_B" = true ] ; then
         # Download and unpack source files
         # Download and unpack source files
         cd $BUILD_DIR
         cd $BUILD_DIR
         download_file $PHP '-' | tar xz
         download_file $PHP '-' | tar xz
-        download_file $OPENSSL '-' | tar xz
 
 
-        # Rename openssl folder
-        mv openssl-$OPENSSL_V openssl
-       
         # Change to untarred php directory
         # Change to untarred php directory
         cd $BUILD_DIR_PHP
         cd $BUILD_DIR_PHP
 
 
         # Configure PHP
         # Configure PHP
         if [ $BUILD_ARCH = 'amd64' ]; then
         if [ $BUILD_ARCH = 'amd64' ]; then
-            ./configure   --prefix=/usr/local/hestia/php \
+            ./configure --prefix=/usr/local/hestia/php \
                         --enable-fpm \
                         --enable-fpm \
                         --with-fpm-user=admin \
                         --with-fpm-user=admin \
                         --with-fpm-group=admin \
                         --with-fpm-group=admin \
                         --with-libdir=lib/x86_64-linux-gnu \
                         --with-libdir=lib/x86_64-linux-gnu \
-                        --with-openssl=$BUILD_DIR \
+                        --with-openssl \
                         --with-mysqli \
                         --with-mysqli \
                         --with-gettext \
                         --with-gettext \
                         --with-curl \
                         --with-curl \
@@ -482,12 +478,12 @@ if [ "$PHP_B" = true ] ; then
                         --with-gmp \
                         --with-gmp \
                         --enable-mbstring
                         --enable-mbstring
         else
         else
-            ./configure   --prefix=/usr/local/hestia/php \
+            ./configure --prefix=/usr/local/hestia/php \
                         --enable-fpm \
                         --enable-fpm \
                         --with-fpm-user=admin \
                         --with-fpm-user=admin \
                         --with-fpm-group=admin \
                         --with-fpm-group=admin \
                         --with-libdir=lib/aarch64-linux-gnu \
                         --with-libdir=lib/aarch64-linux-gnu \
-                        --with-openssl=$BUILD_DIR \
+                        --with-openssl \
                         --with-mysqli \
                         --with-mysqli \
                         --with-gettext \
                         --with-gettext \
                         --with-curl \
                         --with-curl \
@@ -571,7 +567,6 @@ if [ "$PHP_B" = true ] ; then
     # clear up the source folder
     # clear up the source folder
     if [ "$KEEPBUILD" != 'true' ]; then
     if [ "$KEEPBUILD" != 'true' ]; then
         rm -r $BUILD_DIR/php-$(echo $PHP_V |cut -d"~" -f1)
         rm -r $BUILD_DIR/php-$(echo $PHP_V |cut -d"~" -f1)
-        rm -r $BUILD_DIR/openssl
         rm -r $BUILD_DIR_HESTIAPHP
         rm -r $BUILD_DIR_HESTIAPHP
         if [ "$use_src_folder" == 'true' ] && [ -d $BUILD_DIR/hestiacp-$branch_dash ]; then
         if [ "$use_src_folder" == 'true' ] && [ -d $BUILD_DIR/hestiacp-$branch_dash ]; then
             rm -r $BUILD_DIR/hestiacp-$branch_dash
             rm -r $BUILD_DIR/hestiacp-$branch_dash