Call function for OS detection. Add OpenSSL path for version 1.0 to configuration parameter.
This commit is contained in:
parent
e0cd9f742b
commit
a46c166903
@ -122,6 +122,13 @@ else
|
|||||||
SYSTEMD_EXISTS=true
|
SYSTEMD_EXISTS=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# - Set variable
|
||||||
|
# - os_dist
|
||||||
|
# - os_version
|
||||||
|
# - os_codename
|
||||||
|
# -
|
||||||
|
detect_os_1
|
||||||
|
|
||||||
_required_base_packages=""
|
_required_base_packages=""
|
||||||
_required_compiler_packages=""
|
_required_compiler_packages=""
|
||||||
_required_extension_packages=""
|
_required_extension_packages=""
|
||||||
@ -1021,8 +1028,17 @@ config_params="
|
|||||||
--with-pcre-regex \
|
--with-pcre-regex \
|
||||||
--enable-wddx \
|
--enable-wddx \
|
||||||
--enable-exif \
|
--enable-exif \
|
||||||
--with-zlib \
|
--with-zlib"
|
||||||
--with-openssl \
|
|
||||||
|
if [[ "$os_dist" = "debian" ]] && [[ $os_version -gt 8 ]] && [[ $MAIN_VERSION -lt 7 ]]; then
|
||||||
|
config_params="$config_params \
|
||||||
|
--with-openssl=/usr/local/openssl"
|
||||||
|
else
|
||||||
|
config_params="$config_params \
|
||||||
|
--with-openssl"
|
||||||
|
fi
|
||||||
|
|
||||||
|
config_params="$config_params \
|
||||||
--with-gdbm \
|
--with-gdbm \
|
||||||
--with-jpeg-dir \
|
--with-jpeg-dir \
|
||||||
--with-png-dir \
|
--with-png-dir \
|
||||||
@ -1124,14 +1140,26 @@ if $WITH_PHP_FPM_SUPPORT ; then
|
|||||||
config_params="$config_params --enable-fpm"
|
config_params="$config_params --enable-fpm"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo "LDFLAGS=\"-s\" \
|
||||||
|
./configure $config_params" > ${_logdir}/php-configure.log
|
||||||
|
echo "" >> ${_logdir}/php-configure.log
|
||||||
|
|
||||||
LDFLAGS="-s" \
|
LDFLAGS="-s" \
|
||||||
./configure $config_params > ${_logdir}/php-configure.log 2>&1
|
./configure $config_params >> ${_logdir}/php-configure.log 2>&1
|
||||||
|
if [ "$?" = "0" ]; then
|
||||||
|
echo_ok
|
||||||
|
else
|
||||||
|
echo_failed
|
||||||
|
fatal "Configuring PHP failed!\n\t see ${_logdir}/php-configure.log for more details"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echononl "\tGoing to compile.."
|
||||||
make > ${_logdir}/php-make.log 2>&1
|
make > ${_logdir}/php-make.log 2>&1
|
||||||
if [ "$?" = "0" ]; then
|
if [ "$?" = "0" ]; then
|
||||||
echo_ok
|
echo_ok
|
||||||
else
|
else
|
||||||
echo_failed
|
echo_failed
|
||||||
fatal "Configuring PHP failed!\n\t see ${_logdir}/php-make.log for more details"
|
fatal "Compiling PHP failed!\n\t see ${_logdir}/php-make.log for more details"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user