Skip to content

Prepend brew's pkgconfig to PKG_CONFIG_PATH #16741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 32 commits into from
Closed

Prepend brew's pkgconfig to PKG_CONFIG_PATH #16741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
9ce1463
Prepend brew's pkgconfig to PKG_CONFIG_PATH
cmb69 Nov 9, 2024
8e3fe9c
disable unrelated CI
cmb69 Nov 9, 2024
f484229
don't add openssl 1.1 to PKG_CONFIG_PATH
cmb69 Nov 9, 2024
76d0c05
Try openssl@3
cmb69 Nov 9, 2024
d2bc388
moar
cmb69 Nov 9, 2024
db46229
brew reinstall openldap
cmb69 Nov 10, 2024
6c8621d
debug
cmb69 Nov 11, 2024
405166b
more debugging
cmb69 Nov 12, 2024
ef8016a
install pkgconf
cmb69 Nov 12, 2024
1d0925f
unlink pkg-config
cmb69 Nov 12, 2024
031538e
fix PATH
cmb69 Nov 12, 2024
7c35ecd
Revert "fix PATH"
cmb69 Nov 13, 2024
bacafaa
Try to stick with cURL 8.10.1
cmb69 Nov 13, 2024
017a664
Revert "Try to stick with cURL 8.10.1"
cmb69 Nov 13, 2024
0c08ddf
hack along
cmb69 Nov 13, 2024
f0e5839
Revert "hack along"
cmb69 Nov 13, 2024
817356e
moar
cmb69 Nov 13, 2024
0c982a8
brew --cellar
cmb69 Nov 13, 2024
efdaba7
step back
cmb69 Nov 13, 2024
a634270
replace pkg-config link
cmb69 Nov 13, 2024
82ea398
fix?
cmb69 Nov 13, 2024
4a88cc4
fox
cmb69 Nov 13, 2024
52fd11c
moar
cmb69 Nov 13, 2024
3b97ffb
whereis pkgconf
cmb69 Nov 13, 2024
1179c11
fix
cmb69 Nov 13, 2024
95231f6
fox
cmb69 Nov 13, 2024
0172698
d'oh
cmb69 Nov 13, 2024
8f85ebe
remove debug
cmb69 Nov 13, 2024
fd7c579
don't install OpenLDAP
cmb69 Nov 13, 2024
3d74810
Revert "remove debug"
cmb69 Nov 13, 2024
b1fbadf
patch libcurl.pc
cmb69 Nov 13, 2024
df9febc
try it
cmb69 Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
188 changes: 0 additions & 188 deletions .circleci/config.yml
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions .cirrus.yml
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions .github/actions/brew/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ runs:
# Some packages exist on x86 but not arm, or vice versa.
# Install them with reinstall to avoid warnings.
brew reinstall autoconf webp tidy-html5 libzip libsodium icu4c curl
brew uninstall pkg-config
brew install \
pkgconf \
bison \
re2c
brew install \
Expand Down
21 changes: 14 additions & 7 deletions .github/actions/configure-macos/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,20 @@ runs:
set -x
BREW_OPT="$(brew --prefix)"/opt
export PATH="$BREW_OPT/bison/bin:$PATH"
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/openssl@1.1/lib/pkgconfig"
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/curl/lib/pkgconfig"
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libffi/lib/pkgconfig"
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libxml2/lib/pkgconfig"
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libxslt/lib/pkgconfig"
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/zlib/lib/pkgconfig"
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/icu4c/lib/pkgconfig"
ln -s "$(brew --prefix)/bin/pkgconf" "$(brew --prefix)/bin/pkg-config"
export PKG_CONFIG_PATH="$BREW_OPT/openssl@3/lib/pkgconfig:$PKG_CONFIG_PATH"
export PKG_CONFIG_PATH="$BREW_OPT/curl/lib/pkgconfig:$PKG_CONFIG_PATH"
export PKG_CONFIG_PATH="$BREW_OPT/libffi/lib/pkgconfig:$PKG_CONFIG_PATH"
export PKG_CONFIG_PATH="$BREW_OPT/libxml2/lib/pkgconfig:$PKG_CONFIG_PATH"
export PKG_CONFIG_PATH="$BREW_OPT/libxslt/lib/pkgconfig:$PKG_CONFIG_PATH"
export PKG_CONFIG_PATH="$BREW_OPT/zlib/lib/pkgconfig:$PKG_CONFIG_PATH"
export PKG_CONFIG_PATH="$BREW_OPT/icu4c/lib/pkgconfig:$PKG_CONFIG_PATH"
sed -i -e 's/Requires\.private:.*//g' "$BREW_OPT/curl/lib/pkgconfig/libcurl.pc"
cat "$BREW_OPT/curl/lib/pkgconfig/libcurl.pc"
pkg-config --version
pkg-config --modversion libcurl
pkg-config --libs libcurl
pkg-config --cflags libcurl
./buildconf --force
./configure \
--enable-option-checking=fatal \
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ env:
CXX: ccache g++
jobs:
LINUX_X64:
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
if: false
services:
mysql:
image: mysql:8.3
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
if: ${{ !matrix.asan }}
uses: ./.github/actions/verify-generated-files
LINUX_X32:
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
if: false
name: LINUX_X32_DEBUG_ZTS
runs-on: ubuntu-latest
timeout-minutes: 50
Expand Down Expand Up @@ -226,7 +226,7 @@ jobs:
- name: Verify generated files are up to date
uses: ./.github/actions/verify-generated-files
WINDOWS:
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
if: false
name: WINDOWS_X64_ZTS
runs-on: windows-2022
timeout-minutes: 50
Expand Down Expand Up @@ -254,7 +254,7 @@ jobs:
run: .github/scripts/windows/test.bat
BENCHMARKING:
name: BENCHMARKING
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
if: false
runs-on: ubuntu-24.04
timeout-minutes: 50
steps:
Expand Down