From 61f40827c7e966fbb3776a3b420a127707499bb3 Mon Sep 17 00:00:00 2001 From: Ludvig Michaelsson Date: Tue, 7 Nov 2023 08:17:41 +0100 Subject: [PATCH] xxx --- .github/workflows/macos_builds.yml | 3 ++- build-aux/ci/build-osx.sh | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml index 04faf3c..8194043 100644 --- a/.github/workflows/macos_builds.yml +++ b/.github/workflows/macos_builds.yml @@ -13,7 +13,8 @@ jobs: steps: - uses: actions/checkout@v4 - name: dependencies - run: brew install check cmake help2man libfido2 mandoc pkg-config automake + run: | + brew install check cmake help2man libfido2 mandoc pkg-config automake - name: build env: CC: ${{ matrix.cc }} diff --git a/build-aux/ci/build-osx.sh b/build-aux/ci/build-osx.sh index a37a72e..4ddde37 100755 --- a/build-aux/ci/build-osx.sh +++ b/build-aux/ci/build-osx.sh @@ -2,9 +2,13 @@ set -ex # Link to the same OpenSSL version as libfido2. -OPENSSL="$(brew deps --installed libfido2 | grep openssl)" +OPENSSL="$(brew deps --installed libfido2 | grep -q openssl)" +if [[ -z "${OPENSSL}" ]]; then + OPENSSL_PKGCONF="" +else + OPENSSL_PKGCONF="$(brew --prefix "${OPENSSL}")/lib/pkgconfig" +fi LIBFIDO2_PKGCONF="$(brew --prefix libfido2)/lib/pkgconfig" -OPENSSL_PKGCONF="$(brew --prefix "${OPENSSL}")/lib/pkgconfig" export PKG_CONFIG_PATH="${LIBFIDO2_PKGCONF}:${OPENSSL_PKGCONF}" ./autogen.sh