Fixed finding CURL on systems with multiarch support#2632
Closed
cebe wants to merge 1 commit intophp:PHP-7.0from
Closed
Fixed finding CURL on systems with multiarch support#2632cebe wants to merge 1 commit intophp:PHP-7.0from
cebe wants to merge 1 commit intophp:PHP-7.0from
Conversation
fixes https://bugs.php.net/bug.php?id=74125 This commit makes the cURL config script aware of debian/ubuntu [multiarch support][1] which installs architecture specific headers in a different location. It checks whether the `dpkg-architecture` script exists and is executeable, if that is the case, the multiarch architecture is detected by calling `dpkg-architecture -qDEB_HOST_MULTIARCH` as documented in [debian multiarch implementation docs][2]: > `/usr/include/<triplet>`: used for arch-varying headers [1]: https://wiki.debian.org/Multiarch [2]: https://wiki.debian.org/Multiarch/Implementation
Contributor
Author
|
https://github.com/php/php-src/blob/master/CONTRIBUTING.md says to send the PR against PHP 7.0. Hope its correct now. |
Contributor
|
Works for me on Debian Buster. 👍 My previous local quick-hack: --- a/ext/curl/config.m4
+++ b/ext/curl/config.m4
@@ -11,7 +11,7 @@ if test "$PHP_CURL" != "no"; then
else
AC_MSG_CHECKING(for cURL in default path)
for i in /usr/local /usr; do
- if test -r $i/include/curl/easy.h; then
+ if test -r $i/include/x86_64-linux-gnu/curl/easy.h; then
CURL_DIR=$i
AC_MSG_RESULT(found in $i)
break |
Member
|
Merged 3fd7d81 Thanks. |
Contributor
Author
|
As I see, the patch was included in 7.2.0beta2, will this patch be applied to earlier versions of PHP 7 as well? e.g. 7.0 and 7.1? Should I send pull requests to the other branches? |
Member
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
this should fix https://bugs.php.net/bug.php?id=74125 tested on debian stretch.
This commit makes the cURL config script aware of debian/ubuntu multiarch support which installs architecture specific headers in a different location.
It checks whether the
dpkg-architecturescript exists and is executeable, if that is the case, the multiarch architecture is detected by callingdpkg-architecture -qDEB_HOST_MULTIARCHasdocumented in debian multiarch implementation docs: