From 9ce14636a6d5b7935b1538d8b5187341c04ee2de Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Sat, 9 Nov 2024 18:48:18 +0100 Subject: [PATCH 01/32] Prepend brew's pkgconfig to PKG_CONFIG_PATH This is another attempt to fix recent macOS x64 configure failures. --- .github/actions/configure-macos/action.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index ab92dfb2d782f..9c362eee08b0b 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -11,13 +11,13 @@ 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" + export PKG_CONFIG_PATH="$BREW_OPT/openssl@1.1/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" ./buildconf --force ./configure \ --enable-option-checking=fatal \ From 8e3fe9c30d4d9da24be93988e210a9021d0c8f97 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Sat, 9 Nov 2024 19:13:49 +0100 Subject: [PATCH 02/32] disable unrelated CI --- .circleci/config.yml | 188 ------------------------------------- .cirrus.yml | 31 ------ .github/workflows/push.yml | 8 +- 3 files changed, 4 insertions(+), 223 deletions(-) delete mode 100644 .circleci/config.yml delete mode 100644 .cirrus.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 78520332dfc7e..0000000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,188 +0,0 @@ -version: 2.1 - -jobs: - arm: - resource_class: arm.medium - docker: - - image: cimg/base:current-22.04 - - image: mysql:8.3 - environment: - MYSQL_ALLOW_EMPTY_PASSWORD: true - MYSQL_ROOT_PASSWORD: '' - MYSQL_DATABASE: test - - image: postgres:16 - environment: - POSTGRES_PASSWORD: postgres - POSTGRES_DB: test - environment: - LANGUAGE: '' - LANG: en_US.UTF-8 - MYSQL_TEST_HOST: '127.0.0.1' - MYSQL_TEST_PASSWD: '' - MYSQL_TEST_USER: root - PDO_MYSQL_TEST_DSN: 'mysql:host=127.0.0.1;dbname=test' - PDO_MYSQL_TEST_PASS: '' - PDO_MYSQL_TEST_USER: root - PDO_PGSQL_TEST_DSN: 'pgsql:host=127.0.0.1 port=5432 dbname=test user=postgres password=postgres' - steps: - - checkout - - run: - name: apt - command: | - export DEBIAN_FRONTEND=noninteractive - sudo apt-get update -y - sudo apt-get install -y \ - gcc \ - g++ \ - autoconf \ - bison \ - re2c \ - locales \ - locales-all \ - ldap-utils \ - openssl \ - slapd \ - libgmp-dev \ - libicu-dev \ - libtidy-dev \ - libenchant-2-dev \ - libsasl2-dev \ - libxpm-dev \ - libzip-dev \ - libbz2-dev \ - libsqlite3-dev \ - libwebp-dev \ - libonig-dev \ - libcurl4-openssl-dev \ - libxml2-dev \ - libxslt1-dev \ - libpq-dev \ - libreadline-dev \ - libldap2-dev \ - libsodium-dev \ - libargon2-0-dev \ - libmm-dev \ - libsnmp-dev \ - snmpd \ - `#snmp-mibs-downloader` \ - freetds-dev \ - `#unixodbc-dev` \ - dovecot-core \ - dovecot-pop3d \ - dovecot-imapd \ - sendmail \ - firebird-dev \ - liblmdb-dev \ - libtokyocabinet-dev \ - libdb-dev \ - libqdbm-dev \ - libjpeg-dev \ - libpng-dev \ - libfreetype6-dev - - run: - name: ./configure - command: | - ./buildconf -f - ./configure \ - --enable-debug \ - --enable-zts \ - --enable-option-checking=fatal \ - --prefix=/usr \ - --enable-phpdbg \ - --enable-fpm \ - --enable-opcache \ - --with-pdo-mysql=mysqlnd \ - --with-mysqli=mysqlnd \ - --with-pgsql \ - --with-pdo-pgsql \ - --with-pdo-sqlite \ - --enable-intl \ - --without-pear \ - --enable-gd \ - --with-jpeg \ - --with-webp \ - --with-freetype \ - --with-xpm \ - --enable-exif \ - --with-zip \ - --with-zlib \ - --enable-soap \ - --enable-xmlreader \ - --with-xsl \ - --with-tidy \ - --enable-sysvsem \ - --enable-sysvshm \ - --enable-shmop \ - --enable-pcntl \ - --with-readline \ - --enable-mbstring \ - --with-curl \ - --with-gettext \ - --enable-sockets \ - --with-bz2 \ - --with-openssl \ - --with-gmp \ - --enable-bcmath \ - --enable-calendar \ - --enable-ftp \ - --with-enchant=/usr \ - --enable-sysvmsg \ - --with-ffi \ - --enable-zend-test \ - --enable-dl-test=shared \ - --with-ldap \ - --with-ldap-sasl \ - --with-password-argon2 \ - --with-mhash \ - --with-sodium \ - --enable-dba \ - --with-cdb \ - --enable-flatfile \ - --enable-inifile \ - --with-tcadb \ - --with-lmdb \ - --with-qdbm \ - --with-snmp \ - `#--with-unixODBC` \ - `#--with-pdo-odbc=unixODBC,/usr` \ - --with-config-file-path=/etc \ - --with-config-file-scan-dir=/etc/php.d \ - --with-pdo-firebird \ - `#--with-pdo-dblib` \ - --disable-phpdbg \ - `#--enable-werror` - - run: - name: make - command: make -j2 > /dev/null - - run: - name: make install - command: | - sudo make install - sudo mkdir -p /etc/php.d - sudo chmod 777 /etc/php.d - echo opcache.enable_cli=1 > /etc/php.d/opcache.ini - echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini - - run: - name: Test - no_output_timeout: 30m - command: | - sapi/cli/php run-tests.php \ - -d zend_extension=opcache.so \ - -d opcache.enable_cli=1 \ - -d opcache.jit_buffer_size=64M \ - -d opcache.jit=tracing \ - -d zend_test.observer.enabled=1 \ - -d zend_test.observer.show_output=0 \ - -P -q -x -j2 \ - -g FAIL,BORK,LEAK,XLEAK \ - --no-progress \ - --offline \ - --show-diff \ - --show-slow 1000 \ - --set-timeout 120 \ - --repeat 2 - -workflows: - push-workflow: - jobs: - - arm diff --git a/.cirrus.yml b/.cirrus.yml deleted file mode 100644 index e13e22fd4e816..0000000000000 --- a/.cirrus.yml +++ /dev/null @@ -1,31 +0,0 @@ -env: - CIRRUS_CLONE_DEPTH: 1 - -freebsd_task: - name: FREEBSD_DEBUG_NTS - timeout_in: 50m - freebsd_instance: - image_family: freebsd-13-3 - skip: "changesIncludeOnly('docs/**', 'NEWS', 'UPGRADING', 'UPGRADING.INTERNALS', '**/README.*', 'CONTRIBUTING.md', 'CODING_STANDARDS.md', '.circleci/**', 'EXTENSIONS', '**.md', 'docs-old/**')" - env: - ARCH: amd64 - install_script: - #- sed -i -e 's/quarterly/latest/g' /etc/pkg/FreeBSD.conf - #- pkg upgrade -y - - kldload accf_http - - pkg install -y autoconf bison gmake re2c icu libiconv png freetype2 enchant2 bzip2 t1lib gmp tidyp libsodium libzip libxml2 libxslt openssl oniguruma pkgconf webp libavif - script: - - ./buildconf -f - - ./configure --prefix=/usr/local --enable-debug --enable-option-checking=fatal --enable-fpm --with-pdo-sqlite --without-pear --with-bz2 --with-avif --with-jpeg --with-webp --with-freetype --enable-gd --enable-exif --with-zip --with-zlib --enable-soap --enable-xmlreader --with-xsl --with-libxml --enable-shmop --enable-pcntl --enable-mbstring --with-curl --enable-sockets --with-openssl --with-iconv=/usr/local --enable-bcmath --enable-calendar --enable-ftp --with-ffi --enable-zend-test --enable-dl-test=shared --enable-intl --with-mhash --with-sodium --enable-werror --with-config-file-path=/etc --with-config-file-scan-dir=/etc/php.d - - gmake -j2 - - mkdir /etc/php.d - - gmake install - - echo opcache.enable_cli=1 > /etc/php.d/opcache.ini - - echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini - # Specify opcache.preload_user as we're running as root. - - echo opcache.preload_user=root >> /etc/php.d/opcache.ini - tests_script: - - export SKIP_IO_CAPTURE_TESTS=1 - - export CI_NO_IPV6=1 - - export STACK_LIMIT_DEFAULTS_CHECK=1 - - sapi/cli/php run-tests.php -P -q -j2 -g FAIL,BORK,LEAK,XLEAK --no-progress --offline --show-diff --show-slow 1000 --set-timeout 120 -d zend_extension=opcache.so diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 6baf80d5f84b0..c3548bb5f271c 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -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 @@ -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 @@ -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 @@ -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: From f4842297040d98f1a94b1bc9e64f098525a0fba4 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Sat, 9 Nov 2024 19:14:37 +0100 Subject: [PATCH 03/32] don't add openssl 1.1 to PKG_CONFIG_PATH --- .github/actions/configure-macos/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index 9c362eee08b0b..30a694d70ae24 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -11,7 +11,6 @@ runs: set -x BREW_OPT="$(brew --prefix)"/opt export PATH="$BREW_OPT/bison/bin:$PATH" - export PKG_CONFIG_PATH="$BREW_OPT/openssl@1.1/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" From 76d0c057a50d9a7df27a1b38a1f207a061379d39 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Sat, 9 Nov 2024 19:44:29 +0100 Subject: [PATCH 04/32] Try openssl@3 --- .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 30a694d70ae24..5542810de2d23 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -11,6 +11,7 @@ runs: set -x BREW_OPT="$(brew --prefix)"/opt export PATH="$BREW_OPT/bison/bin:$PATH" + 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" From d2bc388daffb2d2ef987c07231e1dda696be5b8a Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Sat, 9 Nov 2024 20:13:59 +0100 Subject: [PATCH 05/32] moar --- .github/actions/configure-macos/action.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index 5542810de2d23..fa13a3e309038 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -18,6 +18,8 @@ runs: 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" + export PKG_CONFIG_PATH="$BREW_OPT/openldap/lib/pkgconfig:$PKG_CONFIG_PATH" + brew deps --tree --installed ./buildconf --force ./configure \ --enable-option-checking=fatal \ From db462295aa0d246c1ddca409c850cbf40b31fb2c Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Sun, 10 Nov 2024 12:41:05 +0100 Subject: [PATCH 06/32] brew reinstall openldap --- .github/actions/brew/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/brew/action.yml b/.github/actions/brew/action.yml index 07595a5ada931..e815836b87e6b 100644 --- a/.github/actions/brew/action.yml +++ b/.github/actions/brew/action.yml @@ -13,7 +13,7 @@ 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 reinstall autoconf webp tidy-html5 libzip libsodium icu4c curl openldap brew install \ bison \ re2c From 6c8621dfac4066de97ecdec8a6a2efa8b43305dd Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Mon, 11 Nov 2024 16:44:12 +0100 Subject: [PATCH 07/32] debug --- .github/actions/configure-macos/action.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index fa13a3e309038..9f11d5116c813 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -10,6 +10,8 @@ runs: run: | set -x BREW_OPT="$(brew --prefix)"/opt + ls "$BREW_OPT/curl/lib/pkgconfig" + cat "$BREW_OPT/curl/lib/pkgconfig/libcurl.pc" export PATH="$BREW_OPT/bison/bin:$PATH" 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" @@ -19,6 +21,8 @@ runs: export PKG_CONFIG_PATH="$BREW_OPT/zlib/lib/pkgconfig:$PKG_CONFIG_PATH" export PKG_CONFIG_PATH="$BREW_OPT/icu4c/lib/pkgconfig:$PKG_CONFIG_PATH" export PKG_CONFIG_PATH="$BREW_OPT/openldap/lib/pkgconfig:$PKG_CONFIG_PATH" + pkg-config --modversion libcurl + pkg-config --libs libcurl brew deps --tree --installed ./buildconf --force ./configure \ From 405166b536baf64f2b2c4f2749a8884d6c0100b2 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Tue, 12 Nov 2024 13:01:44 +0100 Subject: [PATCH 08/32] more debugging --- .github/actions/configure-macos/action.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index 9f11d5116c813..1370cb53bd5e9 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -10,8 +10,6 @@ runs: run: | set -x BREW_OPT="$(brew --prefix)"/opt - ls "$BREW_OPT/curl/lib/pkgconfig" - cat "$BREW_OPT/curl/lib/pkgconfig/libcurl.pc" export PATH="$BREW_OPT/bison/bin:$PATH" 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" @@ -21,9 +19,9 @@ runs: export PKG_CONFIG_PATH="$BREW_OPT/zlib/lib/pkgconfig:$PKG_CONFIG_PATH" export PKG_CONFIG_PATH="$BREW_OPT/icu4c/lib/pkgconfig:$PKG_CONFIG_PATH" export PKG_CONFIG_PATH="$BREW_OPT/openldap/lib/pkgconfig:$PKG_CONFIG_PATH" + pkg-config --version pkg-config --modversion libcurl pkg-config --libs libcurl - brew deps --tree --installed ./buildconf --force ./configure \ --enable-option-checking=fatal \ From ef8016adcb4340c7b3b97a29d7970af84da25c34 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Tue, 12 Nov 2024 13:30:54 +0100 Subject: [PATCH 09/32] install pkgconf --- .github/actions/brew/action.yml | 1 + .github/actions/configure-macos/action.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/actions/brew/action.yml b/.github/actions/brew/action.yml index e815836b87e6b..0a133629e48c3 100644 --- a/.github/actions/brew/action.yml +++ b/.github/actions/brew/action.yml @@ -15,6 +15,7 @@ runs: # Install them with reinstall to avoid warnings. brew reinstall autoconf webp tidy-html5 libzip libsodium icu4c curl openldap brew install \ + pkgconf \ bison \ re2c brew install \ diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index 1370cb53bd5e9..7bb6eb5a823aa 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -11,6 +11,7 @@ runs: set -x BREW_OPT="$(brew --prefix)"/opt export PATH="$BREW_OPT/bison/bin:$PATH" + export PATH="$BREW_OPT/pkgconf/bin:$PATH" 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" From 1d0925fe26fe4138b24518b4e9cc9019fe4b9fcf Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Tue, 12 Nov 2024 13:33:00 +0100 Subject: [PATCH 10/32] unlink pkg-config --- .github/actions/brew/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/brew/action.yml b/.github/actions/brew/action.yml index 0a133629e48c3..50ae0da1c70d1 100644 --- a/.github/actions/brew/action.yml +++ b/.github/actions/brew/action.yml @@ -14,6 +14,7 @@ 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 openldap + brew unlink pkg-config brew install \ pkgconf \ bison \ From 031538e4fd3e0abf739195ff9aaed055d52ad3d4 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Tue, 12 Nov 2024 13:46:06 +0100 Subject: [PATCH 11/32] fix PATH --- .github/actions/configure-macos/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index 7bb6eb5a823aa..164690ebe6161 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -11,7 +11,7 @@ runs: set -x BREW_OPT="$(brew --prefix)"/opt export PATH="$BREW_OPT/bison/bin:$PATH" - export PATH="$BREW_OPT/pkgconf/bin:$PATH" + export PATH="/usr/local/Cellar/pkgconf/2.3.0/bin:$PATH" 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" From 7c35ecd0ffd48bd0f98968f758ea17b84e79697f Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 12:16:56 +0100 Subject: [PATCH 12/32] Revert "fix PATH" This reverts commit 031538e4fd3e0abf739195ff9aaed055d52ad3d4. Revert "unlink pkg-config" This reverts commit 1d0925fe26fe4138b24518b4e9cc9019fe4b9fcf. Revert "install pkgconf" This reverts commit ef8016adcb4340c7b3b97a29d7970af84da25c34. --- .github/actions/brew/action.yml | 2 -- .github/actions/configure-macos/action.yml | 1 - 2 files changed, 3 deletions(-) diff --git a/.github/actions/brew/action.yml b/.github/actions/brew/action.yml index 50ae0da1c70d1..e815836b87e6b 100644 --- a/.github/actions/brew/action.yml +++ b/.github/actions/brew/action.yml @@ -14,9 +14,7 @@ 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 openldap - brew unlink pkg-config brew install \ - pkgconf \ bison \ re2c brew install \ diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index 164690ebe6161..1370cb53bd5e9 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -11,7 +11,6 @@ runs: set -x BREW_OPT="$(brew --prefix)"/opt export PATH="$BREW_OPT/bison/bin:$PATH" - export PATH="/usr/local/Cellar/pkgconf/2.3.0/bin:$PATH" 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" From bacafaae7a91bc9f4fa6a55e78590de678dca0a4 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 12:18:34 +0100 Subject: [PATCH 13/32] Try to stick with cURL 8.10.1 --- .github/actions/brew/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/brew/action.yml b/.github/actions/brew/action.yml index e815836b87e6b..8999aa5664c60 100644 --- a/.github/actions/brew/action.yml +++ b/.github/actions/brew/action.yml @@ -13,7 +13,7 @@ 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 openldap + brew reinstall autoconf webp tidy-html5 libzip libsodium icu4c curl@8.10.1 openldap brew install \ bison \ re2c From 017a664c9bd040cdcd30669af9095951641636d2 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 13:35:27 +0100 Subject: [PATCH 14/32] Revert "Try to stick with cURL 8.10.1" This reverts commit bacafaae7a91bc9f4fa6a55e78590de678dca0a4. Reapply "fix PATH" This reverts commit 7c35ecd0ffd48bd0f98968f758ea17b84e79697f. Revert "fix PATH" This reverts commit 031538e4fd3e0abf739195ff9aaed055d52ad3d4. Revert "unlink pkg-config" This reverts commit 1d0925fe26fe4138b24518b4e9cc9019fe4b9fcf. Revert "install pkgconf" This reverts commit ef8016adcb4340c7b3b97a29d7970af84da25c34. --- .github/actions/brew/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/brew/action.yml b/.github/actions/brew/action.yml index 8999aa5664c60..e815836b87e6b 100644 --- a/.github/actions/brew/action.yml +++ b/.github/actions/brew/action.yml @@ -13,7 +13,7 @@ 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@8.10.1 openldap + brew reinstall autoconf webp tidy-html5 libzip libsodium icu4c curl openldap brew install \ bison \ re2c From 0c08ddf1e421f5ecc81e337f87ab72709d4b9b58 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 13:36:41 +0100 Subject: [PATCH 15/32] hack along --- .github/actions/configure-macos/action.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index 1370cb53bd5e9..1fc3e1fbaf1a9 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -11,6 +11,8 @@ runs: set -x BREW_OPT="$(brew --prefix)"/opt export PATH="$BREW_OPT/bison/bin:$PATH" + export PATH="/usr/local/Cellar/pkgconf/2.3.0:$PATH" + ls -l /usr/local/Cellar/pkgconf/2.3.0 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" From f0e58393ac1e8948c6fe2cfe8a889901b9873ce0 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 13:45:30 +0100 Subject: [PATCH 16/32] Revert "hack along" This reverts commit 0c08ddf1e421f5ecc81e337f87ab72709d4b9b58. Reapply "Try to stick with cURL 8.10.1" This reverts commit 017a664c9bd040cdcd30669af9095951641636d2. Revert "Try to stick with cURL 8.10.1" This reverts commit bacafaae7a91bc9f4fa6a55e78590de678dca0a4. Reapply "fix PATH" This reverts commit 7c35ecd0ffd48bd0f98968f758ea17b84e79697f. --- .github/actions/brew/action.yml | 2 ++ .github/actions/configure-macos/action.yml | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/actions/brew/action.yml b/.github/actions/brew/action.yml index e815836b87e6b..50ae0da1c70d1 100644 --- a/.github/actions/brew/action.yml +++ b/.github/actions/brew/action.yml @@ -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 openldap + brew unlink pkg-config brew install \ + pkgconf \ bison \ re2c brew install \ diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index 1fc3e1fbaf1a9..164690ebe6161 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -11,8 +11,7 @@ runs: set -x BREW_OPT="$(brew --prefix)"/opt export PATH="$BREW_OPT/bison/bin:$PATH" - export PATH="/usr/local/Cellar/pkgconf/2.3.0:$PATH" - ls -l /usr/local/Cellar/pkgconf/2.3.0 + export PATH="/usr/local/Cellar/pkgconf/2.3.0/bin:$PATH" 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" From 817356ee8f730845f3c848a4ba4219f47afc01ef Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 14:09:52 +0100 Subject: [PATCH 17/32] moar --- .github/actions/configure-macos/action.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index 164690ebe6161..3cd63d6e8c74c 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -12,6 +12,8 @@ runs: BREW_OPT="$(brew --prefix)"/opt export PATH="$BREW_OPT/bison/bin:$PATH" export PATH="/usr/local/Cellar/pkgconf/2.3.0/bin:$PATH" + ls -l /usr/local/Cellar/pkgconf/2.3.0/bin + ln /usr/local/Cellar/pkgconf/2.3.0/bin/pkgconf /usr/local/Cellar/pkgconf/2.3.0/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" From 0c982a8f3ab44686de2d19769b8db0b0a98fca13 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 14:46:34 +0100 Subject: [PATCH 18/32] brew --cellar --- .github/actions/configure-macos/action.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index 3cd63d6e8c74c..a5a57ecc83426 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -10,10 +10,12 @@ runs: run: | set -x BREW_OPT="$(brew --prefix)"/opt + brew --cellar + ls -l $BREW_OPT/bin export PATH="$BREW_OPT/bison/bin:$PATH" - export PATH="/usr/local/Cellar/pkgconf/2.3.0/bin:$PATH" - ls -l /usr/local/Cellar/pkgconf/2.3.0/bin - ln /usr/local/Cellar/pkgconf/2.3.0/bin/pkgconf /usr/local/Cellar/pkgconf/2.3.0/bin/pkg-config + export PATH="$(brew --cellar)/pkgconf/2.3.0/bin:$PATH" + ls -l $(brew --cellar)/pkgconf/2.3.0/bin + ln $(brew --cellar)/pkgconf/2.3.0/bin/pkgconf $(brew --cellar)/pkgconf/2.3.0/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" @@ -25,6 +27,7 @@ runs: pkg-config --version pkg-config --modversion libcurl pkg-config --libs libcurl + exit 1 ./buildconf --force ./configure \ --enable-option-checking=fatal \ From efdaba74a7a94eb685a3ae72edaee8c4cb1e7965 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 14:49:40 +0100 Subject: [PATCH 19/32] step back --- .github/actions/configure-macos/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index a5a57ecc83426..bee079ba901d7 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -11,7 +11,7 @@ runs: set -x BREW_OPT="$(brew --prefix)"/opt brew --cellar - ls -l $BREW_OPT/bin + ls -l $BREW_OPT export PATH="$BREW_OPT/bison/bin:$PATH" export PATH="$(brew --cellar)/pkgconf/2.3.0/bin:$PATH" ls -l $(brew --cellar)/pkgconf/2.3.0/bin From a6342700cd710fbe61e284052e4d8395f4a31e4f Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 14:56:06 +0100 Subject: [PATCH 20/32] replace pkg-config link --- .github/actions/configure-macos/action.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index bee079ba901d7..103036f435d9b 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -10,12 +10,10 @@ runs: run: | set -x BREW_OPT="$(brew --prefix)"/opt - brew --cellar - ls -l $BREW_OPT export PATH="$BREW_OPT/bison/bin:$PATH" - export PATH="$(brew --cellar)/pkgconf/2.3.0/bin:$PATH" - ls -l $(brew --cellar)/pkgconf/2.3.0/bin - ln $(brew --cellar)/pkgconf/2.3.0/bin/pkgconf $(brew --cellar)/pkgconf/2.3.0/bin/pkg-config + rm "$BREW_OPT/pkg-config" + ln "$BREW_OPT/pkgconf" "$BREW_OPT/pkg-config" + ls -l $BREW_OPT 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" From 82ea398901d97eb59aad90004c3f1ae498d9c48e Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 15:03:52 +0100 Subject: [PATCH 21/32] fix? --- .github/actions/brew/action.yml | 2 +- .github/actions/configure-macos/action.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/actions/brew/action.yml b/.github/actions/brew/action.yml index 50ae0da1c70d1..531b510308f73 100644 --- a/.github/actions/brew/action.yml +++ b/.github/actions/brew/action.yml @@ -14,7 +14,7 @@ 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 openldap - brew unlink pkg-config + brew uninstall pkg-config brew install \ pkgconf \ bison \ diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index 103036f435d9b..dd14651e5a8b5 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -11,8 +11,9 @@ runs: set -x BREW_OPT="$(brew --prefix)"/opt export PATH="$BREW_OPT/bison/bin:$PATH" + ls -l $BREW_OPT rm "$BREW_OPT/pkg-config" - ln "$BREW_OPT/pkgconf" "$BREW_OPT/pkg-config" + ln -s "$BREW_OPT/pkgconf" "$BREW_OPT/pkg-config" ls -l $BREW_OPT 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" From 4a88cc4432940d0d3854382e8eb495ced7705108 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 15:10:59 +0100 Subject: [PATCH 22/32] fox --- .github/actions/configure-macos/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index dd14651e5a8b5..db0097f55d588 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -12,7 +12,6 @@ runs: BREW_OPT="$(brew --prefix)"/opt export PATH="$BREW_OPT/bison/bin:$PATH" ls -l $BREW_OPT - rm "$BREW_OPT/pkg-config" ln -s "$BREW_OPT/pkgconf" "$BREW_OPT/pkg-config" ls -l $BREW_OPT export PKG_CONFIG_PATH="$BREW_OPT/openssl@3/lib/pkgconfig:$PKG_CONFIG_PATH" From 52fd11c8951553e3ee3b2d54449408ba746b563b Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 15:34:15 +0100 Subject: [PATCH 23/32] moar --- .github/actions/configure-macos/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index db0097f55d588..4a43dcea0369a 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -12,8 +12,7 @@ runs: BREW_OPT="$(brew --prefix)"/opt export PATH="$BREW_OPT/bison/bin:$PATH" ls -l $BREW_OPT - ln -s "$BREW_OPT/pkgconf" "$BREW_OPT/pkg-config" - ls -l $BREW_OPT + ln -s "$BREW_OPT/pkgconf/bin/pkgconf" "$BREW_OPT/pkgconf/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" @@ -22,6 +21,7 @@ runs: export PKG_CONFIG_PATH="$BREW_OPT/zlib/lib/pkgconfig:$PKG_CONFIG_PATH" export PKG_CONFIG_PATH="$BREW_OPT/icu4c/lib/pkgconfig:$PKG_CONFIG_PATH" export PKG_CONFIG_PATH="$BREW_OPT/openldap/lib/pkgconfig:$PKG_CONFIG_PATH" + pkgconf --version pkg-config --version pkg-config --modversion libcurl pkg-config --libs libcurl From 3b97ffb929b17e69b98e4a61ab661ba2a12d75bc Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 15:48:06 +0100 Subject: [PATCH 24/32] whereis pkgconf --- .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 4a43dcea0369a..01e90395db749 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -21,6 +21,7 @@ runs: export PKG_CONFIG_PATH="$BREW_OPT/zlib/lib/pkgconfig:$PKG_CONFIG_PATH" export PKG_CONFIG_PATH="$BREW_OPT/icu4c/lib/pkgconfig:$PKG_CONFIG_PATH" export PKG_CONFIG_PATH="$BREW_OPT/openldap/lib/pkgconfig:$PKG_CONFIG_PATH" + whereis pkgconf pkgconf --version pkg-config --version pkg-config --modversion libcurl From 1179c110f2047ecdbc7c5136df0126bbd278568f Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 15:51:11 +0100 Subject: [PATCH 25/32] fix --- .github/actions/configure-macos/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index 01e90395db749..ec08c8987ac36 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -12,7 +12,7 @@ runs: BREW_OPT="$(brew --prefix)"/opt export PATH="$BREW_OPT/bison/bin:$PATH" ls -l $BREW_OPT - ln -s "$BREW_OPT/pkgconf/bin/pkgconf" "$BREW_OPT/pkgconf/bin/pkg-config" + ln -s "$BREW_OPT/bin/pkgconf" "$BREW_OPT/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" From 95231f6a9bf067e9b1d455cd47464b7ad1ea8fd3 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 15:57:04 +0100 Subject: [PATCH 26/32] fox --- .github/actions/configure-macos/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index ec08c8987ac36..997aaf32f300e 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -12,7 +12,7 @@ runs: BREW_OPT="$(brew --prefix)"/opt export PATH="$BREW_OPT/bison/bin:$PATH" ls -l $BREW_OPT - ln -s "$BREW_OPT/bin/pkgconf" "$BREW_OPT/bin/pkg-config" + 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" From 0172698b9e451ac9b47832128c8cf54860356da8 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 16:02:10 +0100 Subject: [PATCH 27/32] d'oh --- .github/actions/configure-macos/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index 997aaf32f300e..634b1c6862bff 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -12,7 +12,7 @@ runs: BREW_OPT="$(brew --prefix)"/opt export PATH="$BREW_OPT/bison/bin:$PATH" ls -l $BREW_OPT - ln -s "$$(brew --prefix)/bin/pkgconf" "$(brew --prefix)/bin/pkg-config" + 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" From 8f85ebea504214c5c84d6f3e1432a0b0179904df Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 16:04:54 +0100 Subject: [PATCH 28/32] remove debug --- .github/actions/configure-macos/action.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index 634b1c6862bff..31c221b0cc7d1 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -11,7 +11,6 @@ runs: set -x BREW_OPT="$(brew --prefix)"/opt export PATH="$BREW_OPT/bison/bin:$PATH" - ls -l $BREW_OPT 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" @@ -21,12 +20,6 @@ runs: export PKG_CONFIG_PATH="$BREW_OPT/zlib/lib/pkgconfig:$PKG_CONFIG_PATH" export PKG_CONFIG_PATH="$BREW_OPT/icu4c/lib/pkgconfig:$PKG_CONFIG_PATH" export PKG_CONFIG_PATH="$BREW_OPT/openldap/lib/pkgconfig:$PKG_CONFIG_PATH" - whereis pkgconf - pkgconf --version - pkg-config --version - pkg-config --modversion libcurl - pkg-config --libs libcurl - exit 1 ./buildconf --force ./configure \ --enable-option-checking=fatal \ From fd7c579fb141091b09c999548f1f7db18c072a14 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 16:07:53 +0100 Subject: [PATCH 29/32] don't install OpenLDAP --- .github/actions/brew/action.yml | 2 +- .github/actions/configure-macos/action.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/brew/action.yml b/.github/actions/brew/action.yml index 531b510308f73..cdf2963b36a85 100644 --- a/.github/actions/brew/action.yml +++ b/.github/actions/brew/action.yml @@ -13,7 +13,7 @@ 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 openldap + brew reinstall autoconf webp tidy-html5 libzip libsodium icu4c curl brew uninstall pkg-config brew install \ pkgconf \ diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index 31c221b0cc7d1..6244189dd7085 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -19,7 +19,6 @@ runs: 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" - export PKG_CONFIG_PATH="$BREW_OPT/openldap/lib/pkgconfig:$PKG_CONFIG_PATH" ./buildconf --force ./configure \ --enable-option-checking=fatal \ From 3d7481030a44e2c1c930cdc5a9476ca301f570fe Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 16:30:44 +0100 Subject: [PATCH 30/32] Revert "remove debug" This reverts commit 8f85ebea504214c5c84d6f3e1432a0b0179904df. --- .github/actions/configure-macos/action.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index 6244189dd7085..bb68b3b4af5f0 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -19,6 +19,12 @@ runs: 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" + cat "$BREW_OPT/curl/lib/pkgconfig/libcurl.pc"; + pkg-config --version + pkg-config --modversion libcurl + pkg-config --libs libcurl + pkg-config --cflags libcurl + exit 1 ./buildconf --force ./configure \ --enable-option-checking=fatal \ From b1fbadf09f7b6bbd454589f3dd9059059d17296e Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 16:57:28 +0100 Subject: [PATCH 31/32] patch libcurl.pc --- .github/actions/configure-macos/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index bb68b3b4af5f0..bcacdac0c06e6 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -19,7 +19,8 @@ runs: 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" - cat "$BREW_OPT/curl/lib/pkgconfig/libcurl.pc"; + 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 From df9febce64c405cc615c8f172411f553dc646022 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 17:01:54 +0100 Subject: [PATCH 32/32] try it --- .github/actions/configure-macos/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index bcacdac0c06e6..b0d9074a2c70a 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -25,7 +25,6 @@ runs: pkg-config --modversion libcurl pkg-config --libs libcurl pkg-config --cflags libcurl - exit 1 ./buildconf --force ./configure \ --enable-option-checking=fatal \