x86 pagespeed build fix and check configuration data
This commit is contained in:
@@ -3,6 +3,11 @@
|
|||||||
### Read config
|
### Read config
|
||||||
. ./config.inc
|
. ./config.inc
|
||||||
|
|
||||||
|
### If the value is incorrect, convert to normal data.
|
||||||
|
if [ ! "$SERVER_HEADER" ]; then SERVER_HEADER="hakase"; fi
|
||||||
|
if [ "$BITCHK" != 32 ] && [ "$BITCHK" != 64 ]; then BITCHK=32; fi
|
||||||
|
if [ ! "$BUILD_MTS" ]; then BUILD_MTS="-j2"; fi
|
||||||
|
|
||||||
### Remove Old file
|
### Remove Old file
|
||||||
rm -f /usr/sbin/nginx.old
|
rm -f /usr/sbin/nginx.old
|
||||||
|
|
||||||
@@ -19,7 +24,7 @@ if [ ! -f "lib/pcre/configure" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
### ZLIB reconf
|
### ZLIB reconf
|
||||||
if [ "$BITCHK" = "64" ]; then
|
if [ "$BITCHK" = 64 ]; then
|
||||||
if [ ! -f "lib/zlib/Makefile" ]; then
|
if [ ! -f "lib/zlib/Makefile" ]; then
|
||||||
cd lib/zlib
|
cd lib/zlib
|
||||||
./configure
|
./configure
|
||||||
@@ -44,16 +49,14 @@ if [ ! -d "lib/pagespeed" ] && [ "$PAGESPEED" = 1 ]; then
|
|||||||
cd incubator-pagespeed-ngx-1.13.35.2-stable
|
cd incubator-pagespeed-ngx-1.13.35.2-stable
|
||||||
|
|
||||||
### Download psol
|
### Download psol
|
||||||
wget -c https://dl.google.com/dl/page-speed/psol/1.13.35.2-x64.tar.gz
|
curl "$(scripts/format_binary_url.sh PSOL_BINARY_URL)" | tar xz
|
||||||
tar -xzvf 1.13.35.2-x64.tar.gz
|
|
||||||
rm -f 1.13.35.2-x64.tar.gz
|
|
||||||
cd ..
|
cd ..
|
||||||
mv incubator-pagespeed-ngx-1.13.35.2-stable pagespeed
|
mv incubator-pagespeed-ngx-1.13.35.2-stable pagespeed
|
||||||
cd ..
|
cd ..
|
||||||
fi
|
fi
|
||||||
|
|
||||||
### x86, x64 Check (Configuration)
|
### x86, x64 Check (Configuration)
|
||||||
if [ "$BITCHK" = "64" ]; then
|
if [ "$BITCHK" = 64 ]; then
|
||||||
BUILD_BIT="-m64 "
|
BUILD_BIT="-m64 "
|
||||||
BUILD_OPENSSL="enable-ec_nistp_64_gcc_128 "
|
BUILD_OPENSSL="enable-ec_nistp_64_gcc_128 "
|
||||||
BUILD_ZLIB="./lib/zlib"
|
BUILD_ZLIB="./lib/zlib"
|
||||||
|
|||||||
+3
-1
@@ -1,3 +1,5 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
### Please install library.
|
### Please install library.
|
||||||
### CentOS / Red Hat - yum install jemalloc-devel libuuid-devel libatomic expat-devel unzip autoconf automake libtool
|
### CentOS / Red Hat - yum install jemalloc-devel libuuid-devel libatomic expat-devel unzip autoconf automake libtool
|
||||||
### Ubuntu / Debian - apt install libjemalloc-dev uuid-dev libatomic1 libatomic-ops-dev expat unzip autoconf automake libtool
|
### Ubuntu / Debian - apt install libjemalloc-dev uuid-dev libatomic1 libatomic-ops-dev expat unzip autoconf automake libtool
|
||||||
@@ -15,7 +17,7 @@ SERVER_HEADER="hakase"
|
|||||||
### (Comment out existing sources.)
|
### (Comment out existing sources.)
|
||||||
### Do not modify it under normal circumstances.
|
### Do not modify it under normal circumstances.
|
||||||
BITCHK=`getconf LONG_BIT`
|
BITCHK=`getconf LONG_BIT`
|
||||||
#BITCHK="32"
|
#BITCHK=32
|
||||||
|
|
||||||
### Multithread build
|
### Multithread build
|
||||||
### Do not modify it under normal circumstances.
|
### Do not modify it under normal circumstances.
|
||||||
|
|||||||
Reference in New Issue
Block a user