Skip to content

Only patch libcurl.pc if it exists #16785

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.

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 2 commits into from

Conversation

cmb69
Copy link
Member

@cmb69 cmb69 commented Nov 13, 2024

This is a follow-up to #16783, because of https://github.com/php/php-src/actions/runs/11823721167/job/32943620474#step:5:98. Apparently, the homegrew people ship curl 8.11.0_1 now, and the .pc is gone (moved, removed, I don't know). Let's see.

@cmb69
Copy link
Member Author

cmb69 commented Nov 13, 2024

No, the problem is likely that BREW_OPT is only defined as of PHP-8.4.

@cmb69
Copy link
Member Author

cmb69 commented Nov 13, 2024

Okay, the configuration passes now, but it fails to build because ICU has been updated to 76.1 in the meantime. Two weeks ago it was on 74.2. As of ICU 75.1 C++17 is required. Not sure what to do here. Ah, would need to backport

AC_MSG_CHECKING([if intl requires -std=gnu++17])
AS_IF([$PKG_CONFIG icu-uc --atleast-version=74],[
AC_MSG_RESULT([yes])
PHP_CXX_COMPILE_STDCXX(17, mandatory, PHP_INTL_STDCXX)
],[
AC_MSG_RESULT([no])
PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX)
])

Should probably fix the version, though.

Anyhow, I'm going to apply this now, since the two issues are unrelated. Can also see whether PHP-8.2 and PHP-8.3 get green.

@cmb69 cmb69 marked this pull request as ready for review November 13, 2024 20:12
@cmb69 cmb69 closed this in d6249b6 Nov 13, 2024
@cmb69
Copy link
Member Author

cmb69 commented Nov 13, 2024

Oh, need to backport fixes for the new ICU version, too: https://github.com/php/php-src/actions/runs/11825254796/job/32948611602#step:8:373

PS: #16788

@cmb69
Copy link
Member Author

cmb69 commented Nov 13, 2024

Ah, would need to backport

Hmm, probably not. Can we lock ICU to 74.2?

PS: #16789.

@cmb69 cmb69 deleted the cmb/libcurl.pc-exists branch November 13, 2024 21:16
ericmann pushed a commit that referenced this pull request Nov 19, 2024
This is only defined as of PHP-8.4; alternatively we could also inline
the `brew --prefix` call, but that makes it harder for upward merges.

Closes GH-16785.
adoy pushed a commit that referenced this pull request Nov 19, 2024
This is only defined as of PHP-8.4; alternatively we could also inline
the `brew --prefix` call, but that makes it harder for upward merges.

Closes GH-16785.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant