From 42ef8f3f0b79859b3de47d9d013292ea3f720b8c Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 13 Jul 2024 11:40:07 +0200 Subject: [PATCH] ci/GHA: simplify mbedTLS build hack for autotools (#1425) Follow-up to e973493f992313b3be73f51d3f7ca6d52e288558 #1393 --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d312dee5..4841ac1c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -593,7 +593,7 @@ jobs: cmake: -DCRYPTO_BACKEND=Libgcrypt - name: 'mbedTLS' install: mbedtls - configure: --with-crypto=mbedtls "--with-libmbedcrypto-prefix=$(brew --prefix)" + configure: --with-crypto=mbedtls "--with-libmbedcrypto-prefix=$(brew --prefix)" CPPFLAGS=-D_LIBSSH2_DISABLE_MBEDTLS36_PK_LOAD_FILE cmake: -DCRYPTO_BACKEND=mbedTLS "-DMBEDTLS_INCLUDE_DIR=$(brew --prefix)/opt/mbedtls/include" "-DMBEDCRYPTO_LIBRARY=$(brew --prefix)/opt/mbedtls/lib/libmbedcrypto.a" -DCMAKE_C_FLAGS=-D_LIBSSH2_DISABLE_MBEDTLS36_PK_LOAD_FILE steps: - name: 'install packages' @@ -605,7 +605,6 @@ jobs: - name: 'autotools configure' if: ${{ matrix.build == 'autotools' }} run: | - [ '${{ matrix.crypto.name }}' = 'mbedTLS' ] && export CPPFLAGS=-D_LIBSSH2_DISABLE_MBEDTLS36_PK_LOAD_FILE mkdir bld && cd bld && ../configure --enable-werror --enable-debug \ --with-libz ${{ matrix.crypto.configure }} \ --disable-docker-tests \