From ef5748e900c92e3bdec41f8b70e73292ae6e5663 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 20:42:28 +0100 Subject: [PATCH 1/2] Only patch libcurl.pc if it exists --- .github/actions/configure-macos/action.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index 7ea4af0457fae..ff9123c58fc83 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -18,7 +18,9 @@ runs: export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxslt/lib/pkgconfig" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/zlib/lib/pkgconfig" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c/lib/pkgconfig" - sed -i -e 's/Requires.private:.*//g' "$BREW_OPT/curl/lib/pkgconfig/libcurl.pc" + if test -f "$BREW_OPT/curl/lib/pkgconfig/libcurl.pc"; then + sed -i -e 's/Requires.private:.*//g' "$BREW_OPT/curl/lib/pkgconfig/libcurl.pc" + fi ./buildconf --force ./configure \ CFLAGS="-Wno-strict-prototypes -Wno-unused-but-set-variable -Wno-single-bit-bitfield-constant-conversion" \ From 51e14c631e31f2c76d349b31e229e2dc2dc8a744 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 20:55:17 +0100 Subject: [PATCH 2/2] need to define BREW_OPT --- .github/actions/configure-macos/action.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index ff9123c58fc83..7312ff5d69f19 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -9,6 +9,7 @@ runs: - shell: bash run: | set -x + BREW_OPT="$(brew --prefix)"/opt export PATH="/usr/local/opt/bison/bin:$PATH" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/openssl@1.1/lib/pkgconfig" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/curl/lib/pkgconfig" @@ -18,9 +19,7 @@ runs: export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxslt/lib/pkgconfig" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/zlib/lib/pkgconfig" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c/lib/pkgconfig" - if test -f "$BREW_OPT/curl/lib/pkgconfig/libcurl.pc"; then - sed -i -e 's/Requires.private:.*//g' "$BREW_OPT/curl/lib/pkgconfig/libcurl.pc" - fi + sed -i -e 's/Requires.private:.*//g' "$BREW_OPT/curl/lib/pkgconfig/libcurl.pc" ./buildconf --force ./configure \ CFLAGS="-Wno-strict-prototypes -Wno-unused-but-set-variable -Wno-single-bit-bitfield-constant-conversion" \