]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Fix custom OpenSSL tests.
authorDarren Tucker <dtucker@dtucker.net>
Mon, 26 Apr 2021 23:18:02 +0000 (09:18 +1000)
committerDarren Tucker <dtucker@dtucker.net>
Tue, 27 Apr 2021 01:44:29 +0000 (11:44 +1000)
Check out specified OpenSSL version.  Install custom libcrypto where
configure expects to find it.  Remove unneeded OpenSSL config time
options.  Older OpenSSL versions were not make -j safe so remove it.

.github/setup_ci.sh

index 1b0c8870e34307115dbd2aee0cd51c6706feb63d..1918a42362fe5c034d1da5d24471184239262ef7 100755 (executable)
@@ -98,9 +98,10 @@ if [ ! -z "${INSTALL_OPENSSL}" ]; then
     (cd ${HOME} &&
      git clone https://github.com/openssl/openssl.git &&
      cd ${HOME}/openssl &&
-     ./config no-threads no-engine no-fips no-shared ${SSLCONFOPTS} \
-         --prefix=/opt/openssl/head &&
-     make -j2 && sudo make install_sw)
+     git checkout ${INSTALL_OPENSSL} &&
+     ./config no-threads ${SSLCONFOPTS} \
+         --prefix=/opt/openssl &&
+     make && sudo make install_sw)
 fi
 
 if [ ! -z "${INSTALL_LIBRESSL}" ]; then
@@ -109,6 +110,6 @@ if [ ! -z "${INSTALL_LIBRESSL}" ]; then
      cd ${HOME}/libressl/portable &&
      git checkout ${INSTALL_LIBRESSL} &&
      sh update.sh && sh autogen.sh &&
-     ./configure --prefix=/opt/libressl/head &&
+     ./configure --prefix=/opt/libressl &&
      make -j2 && sudo make install)
 fi