Skip to content

Commit 9196a72

Browse files
committed
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 phpGH-16741 for more details. Closes phpGH-16783.
1 parent e72854e commit 9196a72

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

.github/actions/configure-macos/action.yml

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ runs:
1818
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxslt/lib/pkgconfig"
1919
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/zlib/lib/pkgconfig"
2020
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c/lib/pkgconfig"
21+
sed -i -e 's/Requires.private:.*//g' "$BREW_OPT/curl/lib/pkgconfig/libcurl.pc"
2122
./buildconf --force
2223
./configure \
2324
CFLAGS="-Wno-strict-prototypes -Wno-unused-but-set-variable -Wno-single-bit-bitfield-constant-conversion" \

0 commit comments

Comments
 (0)