Switch from curl-config to pkg-config for curl extension #2694
Conversation
|
This PR is open for discussion. ping @oerdnj as this is debian related. |
|
Anything that reduces the number of patches we carry for M-A is welcome. |
|
@oerdnj real question is: this PR revert a debian specific patch, and try another implementation (pkg-config), so does it still work on debian ? |
First attemp to fix multiarch support (#74125) for curl introduce some debian specificity (dpkg command) so is not suitable for other environmant. This is mostly related to a broken "curl-config" config on debian which doesn't provide the correct build options, while pkg-config works as expected. This new attemp rely on pkg-config output instead. Notice: this make pkg-config a hard dependency. Is there system without pkg-config ?
remicollet
force-pushed
the
issue-curl-pkgconfig
branch
from
91785a7
to
a87e7f5
Compare
|
I am reasonably certain it should work, but I can try to add this patch to next build and we'll see. |
|
Changed to keep a fallback on curl-config (is some system don't have pkg-config) |
| @@ -6,75 +6,97 @@ PHP_ARG_WITH(curl, for cURL support, | |||
| [ --with-curl[=DIR] Include cURL support]) | |||
|
|
|||
| if test "$PHP_CURL" != "no"; then | |||
| if test -r $PHP_CURL/include/curl/easy.h; then | |||
| CURL_DIR=$PHP_CURL | |||
There was a problem hiding this comment.
should we use pkg-config even if the path is specified explicitly? I would expect the files in <somepath>/include/curl/easy.h to be used regardless of whether pkg-config is available, when I compile PHP with --with-curl=<somepath>
There was a problem hiding this comment.
should we use pkg-config even if the path is specified explicitly?
Yes, this is what is done, using libcurl.pc in specified directory
elif test -r $PHP_CURL/lib/pkgconfig/libcurl.pc; then
Which should (obviously) provides needed build options to use headers from this directory.
|
Notice we have 2 way to specify PATH: Or IMHO, the second should be preferred, (first still works for compatibility) |
|
Merged |
…hp/php-src#2694 php/php-src#2694 tries to automatically find and use pkg-config/libcurl.pc to determine the compilation flags. This is problematic when using a custom cURL binary that itself used pkg-config with openssl. pkg-config does not correctly report the necessary compile flags for cURL's config.m4. PHP still supports the old curl-config option, which we can fall back upon.
First attemp to fix multiarch support (#74125) for curl
introduce some debian specificity (dpkg command)
so is not suitable for other environmant.
This is mostly related to a broken "curl-config" config on debian
which doesn't provide the correct build options, while pkg-config
works as expected.
This new attemp rely on pkg-config output instead.