search

php / php-src

The PHP Interpreter
https://www.php.net
Other
37.57k stars 7.69k forks source link

Compilation failure on pdo_mysql extension for 8.4alpha Docker image #14792

Closed jnoordsij closed 1 day ago

jnoordsij commented 2 days ago

Description

After tagging of the first alpha for 8.4 occurred yesterday, I proceeded to provide an upstream PR to the official Docker image repository: https://github.com/docker-library/php/pull/1526.

However the test for the builds fail when attempting to compile the pdo_mysql extension, which can be reproduced as follows (see also https://github.com/docker-library/php/pull/1526#issuecomment-2204458471):

docker buildx build --pull https://github.com/docker-library/php.git#refs/pull/1526/head:8.4-rc/bookworm/cli --tag php:8.4-rc
docker run -it --rm php:8.4-rc docker-php-ext-install pdo_mysql

Possibly related commits are https://github.com/php/php-src/commit/11accb5cdff7977388fb604698fc7133f6491c0a and https://github.com/php/php-src/commit/715b9aaa09e1ad76a94f32b17da7927592fdae0a, which may require a change in the upstream configuration?

Note: given that there's no official announcement for this alpha release yet and this is thus an overly eager attempt from my side, this might be a known issue that will be resolved before the announcement; if so, feel free to close!

PHP Version

PHP 8.4.0alpha1 (cli) (built: Jul 3 2024 14:16:13) (NTS) (unreleased)

Operating System

Debian bookworm

petk commented 2 days ago

The issue is that phpize build doesn't have the RE2C variable in Makefile. In PHP-8.3 there wasn't this need yet.

petk commented 2 days ago

I see. Docker image already has generated re2c files from the downloaded archive. Ok. That simplifies things a bit. I've split the bugfix and enhancement into separate PRs.

jnoordsij commented 1 day ago

(First off: thanks for the quick action and your efforts to try and help solving this issue!)

I've tried applying this as a patch to the extracted source in the Docker build with some quick patching at https://github.com/jnoordsij/docker-library-php/commit/f9d0ddc5ca9f3ea4742bcb50f7418f7cb9d73896, but it still not seems to be working. Am I missing something?

$ docker buildx build --pull https://github.com/jnoordsij/docker-library-php.git#refs/heads/php8.4-patched:8.4-rc/bookworm/cli --tag php:8.4-rc
...
$ docker run -it --rm php:8.4-rc docker-php-ext-install pdo_mysql
Checking patch NEWS...
error: while searching for:
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 8.4.0alpha2

04 Jul 2024, PHP 8.4.0alpha1

error: patch failed: NEWS:2
Checking patch ext/pdo/config.m4...
Checking patch ext/pdo/config.w32...
Applying patch NEWS with 1 reject...
Rejected hunk #1.
Applied patch ext/pdo/config.m4 cleanly.
Applied patch ext/pdo/config.w32 cleanly.
Configuring for:
PHP Version:             8.4
PHP Api Version:         20230901
Zend Module Api No:      20230901
Zend Extension Api No:   420230901
...
config.status: creating config.h
/bin/bash /usr/src/php/ext/pdo_mysql/libtool --tag=CC --mode=compile cc -I. -I/usr/src/php/ext/pdo_mysql -I/usr/local/include/php -I/usr/local/include/php/main -I/usr/local/include/php/TSRM -I/usr/local/include/php/Zend -I/usr/local/include/php/ext -I/usr/local/include/php/ext/date/lib  -fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CONFIG_H  -fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE   -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DZEND_COMPILE_DL_EXT=1 -c /usr/src/php/ext/pdo_mysql/pdo_mysql.c -o pdo_mysql.lo  -MMD -MF pdo_mysql.dep -MT pdo_mysql.lo
mkdir .libs
 cc -I. -I/usr/src/php/ext/pdo_mysql -I/usr/local/include/php -I/usr/local/include/php/main -I/usr/local/include/php/TSRM -I/usr/local/include/php/Zend -I/usr/local/include/php/ext -I/usr/local/include/php/ext/date/lib -fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CONFIG_H -fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DZEND_COMPILE_DL_EXT=1 -c /usr/src/php/ext/pdo_mysql/pdo_mysql.c -MMD -MF pdo_mysql.dep -MT pdo_mysql.lo  -fPIC -DPIC -o .libs/pdo_mysql.o
/bin/bash /usr/src/php/ext/pdo_mysql/libtool --tag=CC --mode=compile cc -I. -I/usr/src/php/ext/pdo_mysql -I/usr/local/include/php -I/usr/local/include/php/main -I/usr/local/include/php/TSRM -I/usr/local/include/php/Zend -I/usr/local/include/php/ext -I/usr/local/include/php/ext/date/lib  -fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CONFIG_H  -fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE   -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DZEND_COMPILE_DL_EXT=1 -c /usr/src/php/ext/pdo_mysql/mysql_driver.c -o mysql_driver.lo  -MMD -MF mysql_driver.dep -MT mysql_driver.lo
 cc -I. -I/usr/src/php/ext/pdo_mysql -I/usr/local/include/php -I/usr/local/include/php/main -I/usr/local/include/php/TSRM -I/usr/local/include/php/Zend -I/usr/local/include/php/ext -I/usr/local/include/php/ext/date/lib -fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CONFIG_H -fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DZEND_COMPILE_DL_EXT=1 -c /usr/src/php/ext/pdo_mysql/mysql_driver.c -MMD -MF mysql_driver.dep -MT mysql_driver.lo  -fPIC -DPIC -o .libs/mysql_driver.o
/bin/bash /usr/src/php/ext/pdo_mysql/libtool --tag=CC --mode=compile cc -I. -I/usr/src/php/ext/pdo_mysql -I/usr/local/include/php -I/usr/local/include/php/main -I/usr/local/include/php/TSRM -I/usr/local/include/php/Zend -I/usr/local/include/php/ext -I/usr/local/include/php/ext/date/lib  -fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CONFIG_H  -fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE   -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DZEND_COMPILE_DL_EXT=1 -c /usr/src/php/ext/pdo_mysql/mysql_statement.c -o mysql_statement.lo  -MMD -MF mysql_statement.dep -MT mysql_statement.lo
 cc -I. -I/usr/src/php/ext/pdo_mysql -I/usr/local/include/php -I/usr/local/include/php/main -I/usr/local/include/php/TSRM -I/usr/local/include/php/Zend -I/usr/local/include/php/ext -I/usr/local/include/php/ext/date/lib -fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CONFIG_H -fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DZEND_COMPILE_DL_EXT=1 -c /usr/src/php/ext/pdo_mysql/mysql_statement.c -MMD -MF mysql_statement.dep -MT mysql_statement.lo  -fPIC -DPIC -o .libs/mysql_statement.o
/bin/bash /usr/src/php/ext/pdo_mysql/libtool --tag=CC --mode=compile cc -I. -I/usr/src/php/ext/pdo_mysql -I/usr/local/include/php -I/usr/local/include/php/main -I/usr/local/include/php/TSRM -I/usr/local/include/php/Zend -I/usr/local/include/php/ext -I/usr/local/include/php/ext/date/lib  -fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CONFIG_H  -fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE   -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DZEND_COMPILE_DL_EXT=1 -c /usr/src/php/ext/pdo_mysql/mysql_sql_parser.c -o mysql_sql_parser.lo  -MMD -MF mysql_sql_parser.dep -MT mysql_sql_parser.lo
 cc -I. -I/usr/src/php/ext/pdo_mysql -I/usr/local/include/php -I/usr/local/include/php/main -I/usr/local/include/php/TSRM -I/usr/local/include/php/Zend -I/usr/local/include/php/ext -I/usr/local/include/php/ext/date/lib -fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CONFIG_H -fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DZEND_COMPILE_DL_EXT=1 -c /usr/src/php/ext/pdo_mysql/mysql_sql_parser.c -MMD -MF mysql_sql_parser.dep -MT mysql_sql_parser.lo  -fPIC -DPIC -o .libs/mysql_sql_parser.o
/usr/src/php/ext/pdo_mysql/mysql_sql_parser.c:21:10: fatal error: ext/pdo/php_pdo_int.h: No such file or directory
   21 | #include "ext/pdo/php_pdo_int.h"
      |          ^~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
make: *** [Makefile:220: mysql_sql_parser.lo] Error 1
petk commented 1 day ago

Yes, the issue is that this patch needs to be run when building the main Docker image. When it is applied only on the step at docker run -it --rm php:8.4-rc docker-php-ext-install pdo_mysql it will patch the file but the missing PDO headers won't be installed because they were installed in the previous step when building the main Docker image.

Or instead of applying the patch this can be done:

@@ -19,7 +19,7 @@ case "$1" in
                mkdir -p "$dir"
                if [ ! -f "$dir/.docker-extracted" ]; then
                        tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1
-                       curl -s https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch | git -C "$dir" apply --reject || true
+                       cp $dir/ext/pdo/pdo_sql_parser.h $dir/ext/pdo/php_pdo_int.h /usr/local/include/php/ext/pdo/
                        touch "$dir/.docker-extracted"
                fi
                ;;
jnoordsij commented 1 day ago

The patch is part of main Docker image build as well with the change I mentioned above, as the docker-php-source command is being run before building: https://github.com/jnoordsij/docker-library-php/blob/f9d0ddc5ca9f3ea4742bcb50f7418f7cb9d73896/8.4-rc/bookworm/cli/Dockerfile#L125-L126

Moreover, even if I remove the post-compile deletion of the source code that happens after building from the image build (https://github.com/jnoordsij/docker-library-php/blob/f9d0ddc5ca9f3ea4742bcb50f7418f7cb9d73896/8.4-rc/bookworm/cli/Dockerfile#L194), so that the build of the pdo_mysql extension happens with the exact same code state (which we would not want to do for the actual build, since this would heavily bloat the image size), I can see that the same (patched) source code is used for both building operations, but still the pdo_mysql build is failing as above.

petk commented 1 day ago

@jnoordsij sorry. Now I understand. You also need to rebuild the configure script :D Eh, how could I've missed that. This *.m4 files create a configure script with Autoconf and there is a buildconf script that does that. So, after patching run also this:

extract)
        mkdir -p "$dir"
        if [ ! -f "$dir/.docker-extracted" ]; then
            tar -Jxf /usr/src/php.tar.xz -C "$dir" --strip-components=1
            curl -s https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch | git -C "$dir" apply --reject || true
            touch "$dir/.docker-extracted"
            # --> Add this one. This will recreate the configure script: <--
            $dir/buildconf -f
        fi
        ;;
jnoordsij commented 1 day ago

Thanks, that seems to do the trick! Just added https://github.com/docker-library/php/pull/1526/commits/24d1dd740958e64a20feeae4e25d66b558afd925 to verify CI builds all work now.

If I understand correctly from the release process docs, the (re)built configure script should be part of the next alpha release tarball, so all of this patching will no longer be required then and everything should build "just as before"?

petk commented 1 day ago

Thanks, that seems to do the trick! Just added docker-library/php@24d1dd7 to verify CI builds all work now.

If I understand correctly from the release process docs, the (re)built configure script should be part of the next alpha release tarball, so all of this patching will no longer be required then and everything should build "just as before"?

Yes, this configure script is always regenerated and updated for the current sources in the current downloaded archive. You only need to regenerate it like here if you change some Autoconf (*.m4 or configure.ac) file.