From d4939712c6ee2295bdbd461f288923eb90fe8d91 Mon Sep 17 00:00:00 2001 From: ononoki Date: Wed, 27 Apr 2022 08:34:12 +0000 Subject: [PATCH] Update build.sh --- build.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 87d0bab..e25e54f 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ set -e cd /github/home echo Install dependencies. apt-get update > /dev/null 2>&1 -apt-get install --allow-change-held-packages --allow-downgrades --allow-remove-essential -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold -fy cmake curl dpkg-dev git golang libcurl4-openssl-dev libjemalloc-dev libmodsecurity-dev libsodium-dev libunwind-dev libzstd-dev mercurial rsync wget > /dev/null 2>&1 +apt-get install --allow-change-held-packages --allow-downgrades --allow-remove-essential -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold -fy cmake curl git golang libcurl4-openssl-dev libjemalloc-dev libmodsecurity-dev libsodium-dev libunwind-dev libzstd-dev mercurial ninja-build rsync wget > /dev/null 2>&1 wget -qO /etc/apt/trusted.gpg.d/nginx_signing.asc https://nginx.org/keys/nginx_signing.key echo -e 'deb https://nginx.org/packages/mainline/debian bullseye nginx\ndeb-src https://nginx.org/packages/mainline/debian bullseye nginx' >> /etc/apt/sources.list echo -e 'Package: *\nPin: origin nginx.org\nPin: release o=nginx\nPin-Priority: 900' > /etc/apt/preferences.d/99nginx @@ -13,7 +13,6 @@ apt-get source nginx > /dev/null 2>&1 mv nginx-* nginx hg clone -b quic https://hg.nginx.org/nginx-quic > /dev/null 2>&1 rsync -r nginx-quic/ nginx > /dev/null 2>&1 -echo Add patches. cd nginx curl -s https://raw.githubusercontent.com/kn007/patch/master/Enable_BoringSSL_OCSP.patch | patch -p1 > /dev/null 2>&1 curl -s https://raw.githubusercontent.com/kn007/patch/master/use_openssl_md5_sha1.patch | patch -p1 > /dev/null 2>&1 @@ -24,8 +23,8 @@ git clone https://github.com/google/boringssl > /dev/null 2>&1 echo Build boringssl. mkdir boringssl/build cd boringssl/build -cmake .. > /dev/null 2>&1 -make -j$(nproc) > /dev/null 2>&1 +cmake -GNinja .. > /dev/null 2>&1 +ninja > /dev/null 2>&1 echo Fetch additional dependencies. cd ../.. git clone --recursive https://github.com/google/ngx_brotli > /dev/null 2>&1