danwin1210/hosting
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libatomic_ops library not necessary, use gcc internal instead

Browse Source
This commit is contained in:
Daniel Winzen
2022-08-24 21:56:30 +02:00
parent fe19533bec
commit 4ee4acd9c3
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
install_binaries.sh
View File

@ -67,9 +67,6 @@ fi
if [ ! -e set-misc-nginx-module ]; then
git clone https://github.com/openresty/set-misc-nginx-module
fi
if [ ! -e libatomic_ops ]; then
git clone https://github.com/ivmai/libatomic_ops/
fi
cd ..
if [ ! -e php-src ]; then
git clone https://github.com/php/php-src
@ -169,12 +166,7 @@ cd ngx_brotli && git fetch --all && git checkout 6e975bcb015f62e1f30305489778335
cd ngx_devel_kit && git fetch --all && git checkout v0.3.1 && cd ..
cd rds-json-nginx-module && git fetch --all && git checkout v0.15 && cd ..
cd set-misc-nginx-module && git fetch --all && git checkout v0.33 && cd ..
cd libatomic_ops
git fetch --all
git checkout v7.6.12
./autogen.sh
ln -sf .libs/libatomic_ops.a src/libatomic_ops.a
cd ../lua-resty-core
cd lua-resty-core
git fetch --all
git checkout v0.1.23rc1
make -j $PROC_LIMIT install
@ -1411,7 +1403,7 @@ index 7d49803f..b9ee2048 100644
+#endif
EOF
LUAJIT_LIB="/usr/local/lib" LUAJIT_INC="/usr/local/include/luajit-2.1/" ./auto/configure --prefix=/usr/share/nginx --sbin-path=/usr/sbin/nginx --conf-path=/etc/nginx/nginx.conf --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --lock-path=/var/lock/nginx.lock --pid-path=/run/nginx.pid --http-client-body-temp-path=/tmp/body --http-fastcgi-temp-path=/tmp/fastcgi --http-proxy-temp-path=/tmp/proxy --with-threads --with-file-aio --with-pcre-jit --with-http_ssl_module --with-http_v2_module --with-http_v2_hpack_enc --with-http_gzip_static_module --without-http_ssi_module --without-http_userid_module --without-http_mirror_module --without-http_geo_module --without-http_split_clients_module --without-http_uwsgi_module --without-http_scgi_module --without-http_grpc_module --without-http_memcached_module --without-http_empty_gif_module --without-http_browser_module --without-http_upstream_hash_module --without-http_upstream_ip_hash_module --without-http_upstream_least_conn_module --without-http_upstream_keepalive_module --without-http_upstream_zone_module --with-stream --with-stream_ssl_module --without-stream_geo_module --without-stream_map_module --without-stream_split_clients_module --without-stream_return_module --without-stream_upstream_hash_module --without-stream_upstream_least_conn_module --without-stream_upstream_zone_module --with-libatomic=./libatomic_ops --with-cc-opt='-O3 -march=native -mtune=native -fstack-protector-strong -Wformat -Werror=format-security -fPIC -Wdate-time -D_FORTIFY_SOURCE=2' --with-ld-opt='-Wl,-z,relro -Wl,-z,now -fPIC' --add-module=ngx_brotli --add-module=ngx_devel_kit --add-module=rds-json-nginx-module --add-module=set-misc-nginx-module --without-pcre2
LUAJIT_LIB="/usr/local/lib" LUAJIT_INC="/usr/local/include/luajit-2.1/" ./auto/configure --prefix=/usr/share/nginx --sbin-path=/usr/sbin/nginx --conf-path=/etc/nginx/nginx.conf --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --lock-path=/var/lock/nginx.lock --pid-path=/run/nginx.pid --http-client-body-temp-path=/tmp/body --http-fastcgi-temp-path=/tmp/fastcgi --http-proxy-temp-path=/tmp/proxy --with-threads --with-file-aio --with-pcre-jit --with-http_ssl_module --with-http_v2_module --with-http_v2_hpack_enc --with-http_gzip_static_module --without-http_ssi_module --without-http_userid_module --without-http_mirror_module --without-http_geo_module --without-http_split_clients_module --without-http_uwsgi_module --without-http_scgi_module --without-http_grpc_module --without-http_memcached_module --without-http_empty_gif_module --without-http_browser_module --without-http_upstream_hash_module --without-http_upstream_ip_hash_module --without-http_upstream_least_conn_module --without-http_upstream_keepalive_module --without-http_upstream_zone_module --with-stream --with-stream_ssl_module --without-stream_geo_module --without-stream_map_module --without-stream_split_clients_module --without-stream_return_module --without-stream_upstream_hash_module --without-stream_upstream_least_conn_module --without-stream_upstream_zone_module --with-cc-opt='-O3 -march=native -mtune=native -fstack-protector-strong -Wformat -Werror=format-security -fPIC -Wdate-time -D_FORTIFY_SOURCE=2' --with-ld-opt='-Wl,-z,relro -Wl,-z,now -fPIC' --add-module=ngx_brotli --add-module=ngx_devel_kit --add-module=rds-json-nginx-module --add-module=set-misc-nginx-module --without-pcre2
make -j $PROC_LIMIT install
make clean
git reset --hard
@ -1820,7 +1812,7 @@ cd ..
ldconfig
# install composer
curl -sSL https://github.com/composer/composer/releases/download/2.3.10/composer.phar > /usr/bin/composer
curl -sSL https://github.com/composer/composer/releases/download/2.4.1/composer.phar > /usr/bin/composer
chmod +x /usr/bin/composer
composer self-update