Skip to content

Add 7.2 (pre-release) #448

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

Merged
merged 1 commit into from
Jul 11, 2017
Merged

Add 7.2 (pre-release) #448

merged 1 commit into from
Jul 11, 2017

Conversation

tianon
Copy link
Member

@tianon tianon commented Jun 9, 2017

This currently fails to build due to https://bugs.php.net/bug.php?id=74723, but I wanted to get a PR open so we have a place to track the attempt/information.

@tianon
Copy link
Member Author

tianon commented Jun 9, 2017

Oh boo, stretch also fails to compile, needing https://sources.debian.net/src/php7.1/7.1.6-1/debian/patches/0049-Fix-check-for-CURL-include-in-M-A-directory.patch/.

See also https://stackoverflow.com/a/42520953/433558.

From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= <[email protected]>
Date: Wed, 25 Jan 2017 11:17:25 +0100
Subject: Fix check for CURL include in M-A directory

---
 ext/curl/config.m4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/curl/config.m4 b/ext/curl/config.m4
index 2f82c34..f785770 100644
--- a/ext/curl/config.m4
+++ b/ext/curl/config.m4
@@ -6,12 +6,12 @@ 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
+  if test -r $PHP_CURL/include/$DEB_HOST_MULTIARCH/curl/easy.h || test -r $PHP_CURL/include/curl/easy.h; then
     CURL_DIR=$PHP_CURL
   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/$DEB_HOST_MULTIARCH/curl/easy.h || test -r $i/include/curl/easy.h; then
         CURL_DIR=$i
         AC_MSG_RESULT(found in $i)
         break

(See also https://gitlab.sury.org/pkg-php/php/commit/65c8b6e1e52e20c27fb0e027555ab65fef42c500 for what's more likely to be a permanently available URL.)

@tianon
Copy link
Member Author

tianon commented Jun 9, 2017

See also https://bugs.php.net/bug.php?id=74125.

@tianon
Copy link
Member Author

tianon commented Jun 23, 2017

I've now updated this to 7.2.0alpha2 (which is still affected by both bugs).

@tianon
Copy link
Member Author

tianon commented Jun 23, 2017

We'll probably have to apply a patch for the curl headers, and we might have to use --without-pear and install pear out-of-band (to get the updated Archive_Tar), but I hope not 😅.

@tianon
Copy link
Member Author

tianon commented Jul 10, 2017

Updated to 7.2alpha3 and added a workaround for https://bugs.php.net/bug.php?id=74125. 👍

@yosifkit yosifkit merged commit 13b2eeb into docker-library:master Jul 11, 2017
@yosifkit yosifkit deleted the 7.2 branch July 11, 2017 20:12
tianon added a commit to infosiftr/stackbrew that referenced this pull request Jul 12, 2017
- `buildpack-deps`: add `buster` (docker-library/buildpack-deps#61), add `artful` (docker-library/buildpack-deps#63)
- `irssi`: 1.0.4
- `mariadb`: 10.2.7
- `php`: add 7.2.0alpha3 (docker-library/php#448)
- `redmine`: add 3.4 (docker-library/redmine#79)
- `tomcat`: adjust for `stretch` (docker-library/tomcat#76)
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.

2 participants