]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
CI: ssl: keep the old method for ancient OpenSSL versions
authorWilly Tarreau <w@1wt.eu>
Thu, 17 Jun 2021 13:39:30 +0000 (15:39 +0200)
committerWilly Tarreau <w@1wt.eu>
Thu, 17 Jun 2021 13:40:53 +0000 (15:40 +0200)
I forgot about OpenSSL 1.0.2, which neither supports the build_sw target
to build only the software, nor reliably supports parallel builds. Given
that we're building 1.0.2 and 3.0.0, let's stay on the safe side and
keep 1.x sequential.

scripts/build-ssl.sh

index 5342dfc48b8e094c3bad41cacdccea177e4cd15a..1a1d04a67142072961d13f67cfff59f61a677d3b 100755 (executable)
@@ -17,11 +17,17 @@ download_openssl () {
     fi
 }
 
+# recent openssl versions support parallel builds and skipping the docs,
+# while older ones require to build everything sequentially.
 build_openssl_linux () {
     (
         cd "openssl-${OPENSSL_VERSION}/"
         ./config shared --prefix="${HOME}/opt" --openssldir="${HOME}/opt" -DPURIFY
-        make -j$(nproc) build_sw
+        if [ -z "${OPENSSL_VERSION##1.*}" ]; then
+            make all
+        else
+            make -j$(nproc) build_sw
+        fi
         make install_sw
     )
 }