Skip to content

Commit

Permalink
Merge branch '123.09beta01'
Browse files Browse the repository at this point in the history
  • Loading branch information
@centminmod
centminmod committed Feb 20, 2017
2 parents 67e3a7e + 8837b9d commit b45443b
Show file tree
Hide file tree
Showing 19 changed files with 98 additions and 27 deletions.
2 changes: 1 addition & 1 deletion addons/wget.sh
View file
Expand Up @@ -15,7 +15,7 @@ ALTPCRE_VERSION='8.40'
ALTPCRELINKFILE="pcre-${ALTPCRE_VERSION}.tar.gz"
ALTPCRELINK="${LOCALCENTMINMOD_MIRROR}/centminmodparts/pcre/${ALTPCRELINKFILE}"

WGET_VERSION='1.18'
WGET_VERSION='1.19'
WGET_FILENAME="wget-${WGET_VERSION}.tar.gz"
WGET_LINK="http://ftpmirror.gnu.org/wget/${WGET_FILENAME}"
WGET_LINKLOCAL="${LOCALCENTMINMOD_MIRROR}/centminmodparts/wget/${WGET_FILENAME}"
Expand Down
2 changes: 1 addition & 1 deletion centmin.sh
View file
Expand Up @@ -605,7 +605,7 @@ CUSTOM_CURLRPMSYSURL='http://mirror.city-fan.org/ftp/contrib/sysutils/Mirroring'
CUSTOM_CURLRPMLIBURL='http://mirror.city-fan.org/ftp/contrib/libraries'

# wget source compile version
WGET_VERSION='1.18'
WGET_VERSION='1.19'
###############################################################
# Settings for centmin.sh menu option 2 and option 22 for
# the details of the self-signed SSL certificate that is auto
Expand Down
4 changes: 4 additions & 0 deletions inc/nginx_upgrade.inc
View file
Expand Up @@ -899,6 +899,10 @@ find "$DIR_TMP" -maxdepth 1 ! -name "pcre-${NGINX_PCREVER}*" -name 'pcre-*' -exe
echo "dynamic module directory at /usr/local/nginx/modules"
ls -lah /usr/local/nginx/modules
echo
echo "backup dynamic modules to /usr/local/nginx/modules.copy"
mkdir -p /usr/local/nginx/modules.copy
\cp -af /usr/local/nginx/modules/* /usr/local/nginx/modules.copy
ls -lah /usr/local/nginx/modules.copy
fi
echo "log files saved at ${CENTMINLOGDIR}"
Expand Down
50 changes: 45 additions & 5 deletions inc/php_configure.inc
View file
Expand Up @@ -247,19 +247,29 @@ fi
if [[ "$CLANG_PHP" = [yY] ]]; then
if [[ ! -f /usr/bin/clang ]]; then
yum -q -y install clang clang-devel
fi
if [[ "$GCCINTEL_PHP" = [yY] ]]; then
CPUVENDOR=$(cat /proc/cpuinfo | awk '/vendor_id/ {print $3}' | sort -u | head -n1)
if [[ "$(uname -m)" = 'x86_64' && "$CPUVENDOR" = 'GenuineIntel' ]]; then
CCM=64
PHP_MTUNEOPT="-m${CCM} -mtune=native"
else
CCM=""
PHP_MTUNEOPT=""
fi
fi
# ccache compiler has some initial overhead for compiles but speeds up subsequent
# recompiles. however on initial install ccache has no benefits, so for initial
# centmin mod install disabling ccache will in theory speed up first time installs
if [[ "$INITIALINSTALL" != [yY] ]]; then
export CC="ccache /usr/bin/clang"
export CXX="ccache /usr/bin/clang++"
export CC="ccache /usr/bin/clang ${PHP_MTUNEOPT}"
export CXX="ccache /usr/bin/clang++ ${PHP_MTUNEOPT}"
export CCACHE_CPP2=yes
# PLACEHOLDER FOR CLAGS FOR PHP
# CFLAGS=
else
export CC="/usr/bin/clang"
export CXX="/usr/bin/clang++"
export CC="/usr/bin/clang ${PHP_MTUNEOPT}"
export CXX="/usr/bin/clang++ ${PHP_MTUNEOPT}"
# export CCACHE_CPP2=yes
# PLACEHOLDER FOR CLAGS FOR PHP
# CFLAGS=
Expand Down Expand Up @@ -482,6 +492,33 @@ else
PHP_OPENSSLOPT='--with-openssl'
fi

# separate make threads for PHP compiles
if [ -f /proc/user_beancounters ]; then
# CPUS='1'
# MAKETHREADS_PHP=" -j$CPUS"
# speed up make
CPUS_MAKEPHP=$(grep -c "processor" /proc/cpuinfo)
if [[ "$CPUS_MAKEPHP" -gt '8' ]]; then
CPUS_MAKEPHP=$(echo "$CPUS_MAKEPHP+2" | bc)
elif [[ "$CPUS_MAKEPHP" -eq '8' ]]; then
CPUS_MAKEPHP=$(echo "$CPUS_MAKEPHP+1" | bc)
else
CPUS_MAKEPHP=$(echo "$CPUS_MAKEPHP" | bc)
fi
MAKETHREADS_PHP=" -j$CPUS_MAKEPHP"
else
# speed up make
CPUS_MAKEPHP=$(grep -c "processor" /proc/cpuinfo)
if [[ "$CPUS_MAKEPHP" -gt '8' ]]; then
CPUS_MAKEPHP=$(echo "$CPUS_MAKEPHP+2" | bc)
elif [[ "$CPUS_MAKEPHP" -eq '8' ]]; then
CPUS_MAKEPHP=$(echo "$CPUS_MAKEPHP+1" | bc)
else
CPUS_MAKEPHP=$(echo "$CPUS_MAKEPHP" | bc)
fi
MAKETHREADS_PHP=" -j$CPUS_MAKEPHP"
fi

if [[ "$MDB_INSTALL" == [yY] || "$MYSQL_INSTALL" == [yY] ]]; then

echo "../configure --enable-fpm${OPCACHEOPT}${PHPINTLOPT}${PCNTLOPT}${MCRYPT}${RECODEOPT}${SNMPOPT} --with-mhash --with-zlib --with-gettext --enable-exif --enable-zip --with-bz2 --enable-soap --enable-sockets --enable-sysvmsg --enable-sysvsem --enable-sysvshm --enable-shmop --with-pear --enable-mbstring $PHP_OPENSSLOPT --with-mysql=mysqlnd --with-libdir=${LIBDIR} --with-mysqli=mysqlnd --with-mysql-sock=${PHP_MYSQLSOCKPATH}/mysql.sock --with-curl --with-gd --with-xmlrpc --enable-bcmath --enable-calendar${FTPEXTOPT} --enable-gd-native-ttf --with-freetype-dir=${PLIBDIR} --with-jpeg-dir=${PLIBDIR} --with-png-dir=${PLIBDIR} --with-xpm-dir=${PLIBDIR}${LIBVPXOPT}${TLIBOPT} --enable-pdo --with-pdo-sqlite --with-pdo-mysql=mysqlnd${MSSQLOPT} --enable-inline-optimization --with-imap --with-imap-ssl --with-kerberos --with-readline --with-libedit --with-gmp --with-pspell --with-tidy --with-enchant --with-fpm-user=nginx --with-fpm-group=nginx${FILEINFOOPT}${LDAPOPT}${PDOPGSQL_OPT}${OPCACHEHUGEPAGES_OPT} --with-config-file-scan-dir=${CONFIGSCANDIR}${PHPDEBUGOPT}${PHP_EXTRAOPTS}"
Expand All @@ -496,7 +533,10 @@ else

fi

time make${MAKETHREADS}
echo
echo "php_configure.inc make${MAKETHREADS_PHP}"
time make${MAKETHREADS_PHP}
echo

if [[ "$PHPMAKETEST" = [yY] ]]; then
time make test
Expand Down
39 changes: 33 additions & 6 deletions inc/php_upgrade.inc
View file
Expand Up @@ -437,14 +437,41 @@ funct_phpconfigure
# error check
################

# separate make threads for PHP compiles
if [ -f /proc/user_beancounters ]; then
# CPUS='1'
# MAKETHREADS_PHP=" -j$CPUS"
# speed up make
CPUS_MAKEPHP=$(grep -c "processor" /proc/cpuinfo)
if [[ "$CPUS_MAKEPHP" -gt '8' ]]; then
CPUS_MAKEPHP=$(echo "$CPUS_MAKEPHP+2" | bc)
elif [[ "$CPUS_MAKEPHP" -eq '8' ]]; then
CPUS_MAKEPHP=$(echo "$CPUS_MAKEPHP+1" | bc)
else
CPUS_MAKEPHP=$(echo "$CPUS_MAKEPHP" | bc)
fi
MAKETHREADS_PHP=" -j$CPUS_MAKEPHP"
else
# speed up make
CPUS_MAKEPHP=$(grep -c "processor" /proc/cpuinfo)
if [[ "$CPUS_MAKEPHP" -gt '8' ]]; then
CPUS_MAKEPHP=$(echo "$CPUS_MAKEPHP+2" | bc)
elif [[ "$CPUS_MAKEPHP" -eq '8' ]]; then
CPUS_MAKEPHP=$(echo "$CPUS_MAKEPHP+1" | bc)
else
CPUS_MAKEPHP=$(echo "$CPUS_MAKEPHP" | bc)
fi
MAKETHREADS_PHP=" -j$CPUS_MAKEPHP"
fi

if [ -f "$(which figlet)" ]; then
figlet -ckf standard "PHP: Make"
fi
echo "PHPMUVER = $PHPMUVER"
echo "PHP_PGO = $PHP_PGO"
if [[ "$PHP_PGO" = [yY] ]] && [[ "$PHPMUVER" = '7.0' || "$PHPMUVER" = '7.1' ]]; then
echo "make${MAKETHREADS} prof-gen"
time make${MAKETHREADS} prof-gen
echo "make${MAKETHREADS_PHP} prof-gen"
time make${MAKETHREADS_PHP} prof-gen
if [ ! -d "$DIR_TMP/php_pgo_training_scripts" ]; then
pushd "$DIR_TMP"
git clone https://github.com/01org/php_pgo_training_scripts php_pgo_training_scripts
Expand Down Expand Up @@ -475,11 +502,11 @@ funct_phpconfigure
fi
echo "make prof-clean"
time make prof-clean
echo "make${MAKETHREADS} prof-use"
time make${MAKETHREADS} prof-use
echo "make${MAKETHREADS_PHP} prof-use"
time make${MAKETHREADS_PHP} prof-use
else
echo "make${MAKETHREADS}"
time make${MAKETHREADS}
echo "make${MAKETHREADS_PHP}"
time make${MAKETHREADS_PHP}
fi

################
Expand Down
2 changes: 1 addition & 1 deletion installer-gitlab.sh
View file
Expand Up @@ -35,7 +35,7 @@ ALTPCRE_VERSION='8.40'
ALTPCRELINKFILE="pcre-${ALTPCRE_VERSION}.tar.gz"
ALTPCRELINK="${LOCALCENTMINMOD_MIRROR}/centminmodparts/pcre/${ALTPCRELINKFILE}"

WGET_VERSION='1.18'
WGET_VERSION='1.19'
WGET_FILENAME="wget-${WGET_VERSION}.tar.gz"
WGET_LINK="http://ftpmirror.gnu.org/wget/${WGET_FILENAME}"
###########################################################
Expand Down
2 changes: 1 addition & 1 deletion installer-latest-gitlab.sh
View file
Expand Up @@ -35,7 +35,7 @@ ALTPCRE_VERSION='8.40'
ALTPCRELINKFILE="pcre-${ALTPCRE_VERSION}.tar.gz"
ALTPCRELINK="${LOCALCENTMINMOD_MIRROR}/centminmodparts/pcre/${ALTPCRELINKFILE}"

WGET_VERSION='1.18'
WGET_VERSION='1.19'
WGET_FILENAME="wget-${WGET_VERSION}.tar.gz"
WGET_LINK="http://ftpmirror.gnu.org/wget/${WGET_FILENAME}"
###########################################################
Expand Down
2 changes: 1 addition & 1 deletion installer-latest.sh
View file
Expand Up @@ -35,7 +35,7 @@ ALTPCRE_VERSION='8.40'
ALTPCRELINKFILE="pcre-${ALTPCRE_VERSION}.tar.gz"
ALTPCRELINK="${LOCALCENTMINMOD_MIRROR}/centminmodparts/pcre/${ALTPCRELINKFILE}"

WGET_VERSION='1.18'
WGET_VERSION='1.19'
WGET_FILENAME="wget-${WGET_VERSION}.tar.gz"
WGET_LINK="http://ftpmirror.gnu.org/wget/${WGET_FILENAME}"
###########################################################
Expand Down
2 changes: 1 addition & 1 deletion installer-minimal-gitlab.sh
View file
Expand Up @@ -35,7 +35,7 @@ ALTPCRE_VERSION='8.40'
ALTPCRELINKFILE="pcre-${ALTPCRE_VERSION}.tar.gz"
ALTPCRELINK="${LOCALCENTMINMOD_MIRROR}/centminmodparts/pcre/${ALTPCRELINKFILE}"

WGET_VERSION='1.18'
WGET_VERSION='1.19'
WGET_FILENAME="wget-${WGET_VERSION}.tar.gz"
WGET_LINK="http://ftpmirror.gnu.org/wget/${WGET_FILENAME}"
###########################################################
Expand Down
2 changes: 1 addition & 1 deletion installer-minimal.sh
View file
Expand Up @@ -35,7 +35,7 @@ ALTPCRE_VERSION='8.40'
ALTPCRELINKFILE="pcre-${ALTPCRE_VERSION}.tar.gz"
ALTPCRELINK="${LOCALCENTMINMOD_MIRROR}/centminmodparts/pcre/${ALTPCRELINKFILE}"

WGET_VERSION='1.18'
WGET_VERSION='1.19'
WGET_FILENAME="wget-${WGET_VERSION}.tar.gz"
WGET_LINK="http://ftpmirror.gnu.org/wget/${WGET_FILENAME}"
###########################################################
Expand Down
2 changes: 1 addition & 1 deletion installer-ngxpagespeed-gitlab.sh
View file
Expand Up @@ -35,7 +35,7 @@ ALTPCRE_VERSION='8.40'
ALTPCRELINKFILE="pcre-${ALTPCRE_VERSION}.tar.gz"
ALTPCRELINK="${LOCALCENTMINMOD_MIRROR}/centminmodparts/pcre/${ALTPCRELINKFILE}"

WGET_VERSION='1.18'
WGET_VERSION='1.19'
WGET_FILENAME="wget-${WGET_VERSION}.tar.gz"
WGET_LINK="http://ftpmirror.gnu.org/wget/${WGET_FILENAME}"
###########################################################
Expand Down
2 changes: 1 addition & 1 deletion installer-ngxpagespeed.sh
View file
Expand Up @@ -35,7 +35,7 @@ ALTPCRE_VERSION='8.40'
ALTPCRELINKFILE="pcre-${ALTPCRE_VERSION}.tar.gz"
ALTPCRELINK="${LOCALCENTMINMOD_MIRROR}/centminmodparts/pcre/${ALTPCRELINKFILE}"

WGET_VERSION='1.18'
WGET_VERSION='1.19'
WGET_FILENAME="wget-${WGET_VERSION}.tar.gz"
WGET_LINK="http://ftpmirror.gnu.org/wget/${WGET_FILENAME}"
###########################################################
Expand Down
2 changes: 1 addition & 1 deletion installer.sh
View file
Expand Up @@ -35,7 +35,7 @@ ALTPCRE_VERSION='8.40'
ALTPCRELINKFILE="pcre-${ALTPCRE_VERSION}.tar.gz"
ALTPCRELINK="${LOCALCENTMINMOD_MIRROR}/centminmodparts/pcre/${ALTPCRELINKFILE}"

WGET_VERSION='1.18'
WGET_VERSION='1.19'
WGET_FILENAME="wget-${WGET_VERSION}.tar.gz"
WGET_LINK="http://ftpmirror.gnu.org/wget/${WGET_FILENAME}"
###########################################################
Expand Down
2 changes: 1 addition & 1 deletion installer55-gitlab.sh
View file
Expand Up @@ -35,7 +35,7 @@ ALTPCRE_VERSION='8.40'
ALTPCRELINKFILE="pcre-${ALTPCRE_VERSION}.tar.gz"
ALTPCRELINK="${LOCALCENTMINMOD_MIRROR}/centminmodparts/pcre/${ALTPCRELINKFILE}"

WGET_VERSION='1.18'
WGET_VERSION='1.19'
WGET_FILENAME="wget-${WGET_VERSION}.tar.gz"
WGET_LINK="http://ftpmirror.gnu.org/wget/${WGET_FILENAME}"
###########################################################
Expand Down
2 changes: 1 addition & 1 deletion installer55.sh
View file
Expand Up @@ -35,7 +35,7 @@ ALTPCRE_VERSION='8.40'
ALTPCRELINKFILE="pcre-${ALTPCRE_VERSION}.tar.gz"
ALTPCRELINK="${LOCALCENTMINMOD_MIRROR}/centminmodparts/pcre/${ALTPCRELINKFILE}"

WGET_VERSION='1.18'
WGET_VERSION='1.19'
WGET_FILENAME="wget-${WGET_VERSION}.tar.gz"
WGET_LINK="http://ftpmirror.gnu.org/wget/${WGET_FILENAME}"
###########################################################
Expand Down
2 changes: 1 addition & 1 deletion installer56-gitlab.sh
View file
Expand Up @@ -35,7 +35,7 @@ ALTPCRE_VERSION='8.40'
ALTPCRELINKFILE="pcre-${ALTPCRE_VERSION}.tar.gz"
ALTPCRELINK="${LOCALCENTMINMOD_MIRROR}/centminmodparts/pcre/${ALTPCRELINKFILE}"

WGET_VERSION='1.18'
WGET_VERSION='1.19'
WGET_FILENAME="wget-${WGET_VERSION}.tar.gz"
WGET_LINK="http://ftpmirror.gnu.org/wget/${WGET_FILENAME}"
###########################################################
Expand Down
2 changes: 1 addition & 1 deletion installer56.sh
View file
Expand Up @@ -35,7 +35,7 @@ ALTPCRE_VERSION='8.40'
ALTPCRELINKFILE="pcre-${ALTPCRE_VERSION}.tar.gz"
ALTPCRELINK="${LOCALCENTMINMOD_MIRROR}/centminmodparts/pcre/${ALTPCRELINKFILE}"

WGET_VERSION='1.18'
WGET_VERSION='1.19'
WGET_FILENAME="wget-${WGET_VERSION}.tar.gz"
WGET_LINK="http://ftpmirror.gnu.org/wget/${WGET_FILENAME}"
###########################################################
Expand Down
2 changes: 1 addition & 1 deletion installer7-gitlab.sh
View file
Expand Up @@ -35,7 +35,7 @@ ALTPCRE_VERSION='8.40'
ALTPCRELINKFILE="pcre-${ALTPCRE_VERSION}.tar.gz"
ALTPCRELINK="${LOCALCENTMINMOD_MIRROR}/centminmodparts/pcre/${ALTPCRELINKFILE}"

WGET_VERSION='1.18'
WGET_VERSION='1.19'
WGET_FILENAME="wget-${WGET_VERSION}.tar.gz"
WGET_LINK="http://ftpmirror.gnu.org/wget/${WGET_FILENAME}"
###########################################################
Expand Down
2 changes: 1 addition & 1 deletion installer7.sh
View file
Expand Up @@ -35,7 +35,7 @@ ALTPCRE_VERSION='8.40'
ALTPCRELINKFILE="pcre-${ALTPCRE_VERSION}.tar.gz"
ALTPCRELINK="${LOCALCENTMINMOD_MIRROR}/centminmodparts/pcre/${ALTPCRELINKFILE}"

WGET_VERSION='1.18'
WGET_VERSION='1.19'
WGET_FILENAME="wget-${WGET_VERSION}.tar.gz"
WGET_LINK="http://ftpmirror.gnu.org/wget/${WGET_FILENAME}"
###########################################################
Expand Down

0 comments on commit b45443b

Please sign in to comment.