commit: 0114511477c2c09faa967081345798482f041eea Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> AuthorDate: Fri Jul 5 22:18:15 2024 +0000 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> CommitDate: Sat Jul 6 00:44:36 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01145114
dev-lang/php: backport implicit printf patch to 8.2.x Closes: https://bugs.gentoo.org/935451 Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> .../php/files/php-8.2.20-implicit-printf.patch | 65 ++++++++++++++++++++++ dev-lang/php/php-8.2.20.ebuild | 1 + 2 files changed, 66 insertions(+) diff --git a/dev-lang/php/files/php-8.2.20-implicit-printf.patch b/dev-lang/php/files/php-8.2.20-implicit-printf.patch new file mode 100644 index 000000000000..6c0bdb57a35d --- /dev/null +++ b/dev-lang/php/files/php-8.2.20-implicit-printf.patch @@ -0,0 +1,65 @@ +commit 88b30e08cc434ec82cae7881d360bd83fac733a2 +Author: Michael Orlitzky <[email protected]> +Date: Fri Mar 3 12:28:37 2023 -0500 + + ext/iconv/config.m4: add missing stdio.h include. + + The next generation of C compilers is going to enforce the C standard + more strictly: + + https://wiki.gentoo.org/wiki/Modern_C_porting + + One warning that will eventually become an error is + -Wimplicit-function-declaration. This is relatively easy to catch in + most code (it will fail to compile), but inside of autoconf tests it + can go unnoticed because many feature-test compilations fail by + design. For example, + + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <iconv.h>]], + [[iconv_ccs_init(NULL, NULL);]])]... + + is designed to fail if iconv_ccs_init() is not in iconv.h. On the + other hand, + + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include <iconv.h> + int main() { + printf("%d", _libiconv_version); + return 0; + } + + should pass if _libiconv_version is defined. If the user has + -Werror=implicit-function-declaration in his CFLAGS, however, + it will not: + + $ export CFLAGS="$CFLAGS -Werror=implicit-function-declaration" + $ ./configure + ... + checking if using GNU libiconv... no + + This is because the stdio.h header that defines printf() is missing: + + conftest.c:240:3: error: implicit declaration of function 'printf' + [-Werror=implicit-function-declaration] + 240 | printf("%d", _libiconv_version); + | ^~~~~~ + conftest.c:239:1: note: include '<stdio.h>' or provide a declaration + of 'printf' + + This commit adds the include, correcting the test with any compiler + that balks at implicit function definitions. + + Closes GH-10751 + +diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4 +index 5d408de833..3cf400fe96 100644 +--- a/ext/iconv/config.m4 ++++ b/ext/iconv/config.m4 +@@ -30,6 +30,7 @@ if test "$PHP_ICONV" != "no"; then + AC_MSG_CHECKING([if using GNU libiconv]) + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include <iconv.h> ++#include <stdio.h> + int main(void) { + printf("%d", _libiconv_version); + return 0; diff --git a/dev-lang/php/php-8.2.20.ebuild b/dev-lang/php/php-8.2.20.ebuild index 995563df3dfc..f4a2e43fcdb1 100644 --- a/dev-lang/php/php-8.2.20.ebuild +++ b/dev-lang/php/php-8.2.20.ebuild @@ -150,6 +150,7 @@ PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" "${FILESDIR}/php-capstone-optional.patch" "${FILESDIR}/php-8.2.8-openssl-tests.patch" + "${FILESDIR}/php-8.2.20-implicit-printf.patch" ) # ARM/Windows functions (bug 923335)
