Skip to content

Commit 32a6856

Browse files
committed
Build php with existing system openssl resources.
1 parent 51b9705 commit 32a6856

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

src/hst_autocompile.sh

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -459,35 +459,31 @@ if [ "$PHP_B" = true ] ; then
459459
# Download and unpack source files
460460
cd $BUILD_DIR
461461
download_file $PHP '-' | tar xz
462-
download_file $OPENSSL '-' | tar xz
463462

464-
# Rename openssl folder
465-
mv openssl-$OPENSSL_V openssl
466-
467463
# Change to untarred php directory
468464
cd $BUILD_DIR_PHP
469465

470466
# Configure PHP
471467
if [ $BUILD_ARCH = 'amd64' ]; then
472-
./configure --prefix=/usr/local/hestia/php \
468+
./configure --prefix=/usr/local/hestia/php \
473469
--enable-fpm \
474470
--with-fpm-user=admin \
475471
--with-fpm-group=admin \
476472
--with-libdir=lib/x86_64-linux-gnu \
477-
--with-openssl=$BUILD_DIR \
473+
--with-openssl \
478474
--with-mysqli \
479475
--with-gettext \
480476
--with-curl \
481477
--with-zip \
482478
--with-gmp \
483479
--enable-mbstring
484480
else
485-
./configure --prefix=/usr/local/hestia/php \
481+
./configure --prefix=/usr/local/hestia/php \
486482
--enable-fpm \
487483
--with-fpm-user=admin \
488484
--with-fpm-group=admin \
489485
--with-libdir=lib/aarch64-linux-gnu \
490-
--with-openssl=$BUILD_DIR \
486+
--with-openssl \
491487
--with-mysqli \
492488
--with-gettext \
493489
--with-curl \
@@ -571,7 +567,6 @@ if [ "$PHP_B" = true ] ; then
571567
# clear up the source folder
572568
if [ "$KEEPBUILD" != 'true' ]; then
573569
rm -r $BUILD_DIR/php-$(echo $PHP_V |cut -d"~" -f1)
574-
rm -r $BUILD_DIR/openssl
575570
rm -r $BUILD_DIR_HESTIAPHP
576571
if [ "$use_src_folder" == 'true' ] && [ -d $BUILD_DIR/hestiacp-$branch_dash ]; then
577572
rm -r $BUILD_DIR/hestiacp-$branch_dash

0 commit comments

Comments
 (0)