From 9196a72eb00bb95d2766d24a258aa08f21022af0 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 17:17:47 +0100 Subject: [PATCH] Patch libcurl.pc for macOS builds cURL 8.11.0 added a couple of packages to `Requires.private`, but these packages are irrelevant when building against a shared libcurl. For some reason, these private requirements are checked when we're doing `pkg-config --cflags` (that happens with the preinstalled pkg-config 0.29.2, as well as with pkgconf 2.3.0). To avoid further messing with these packages, we just drop the `Requires.private` line from libcurl.pc. See GH-16741 for more details. Closes GH-16783. --- .github/actions/configure-macos/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index 650efcfee88..7ea4af0457f 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -18,6 +18,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" + 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" \