diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-03-04 17:43:01 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-03-04 17:43:01 +0000 |
commit | d0fafa709f2b77dc0e70c99118520000965e4b5a (patch) | |
tree | 170df5ff9fe071343b879da18acce63ee3a1c001 /dev-lang/php | |
parent | 56a597689e7509193b0924a635d2022f21b1a3e4 (diff) |
gentoo auto-resync : 04:03:2024 - 17:43:01
Diffstat (limited to 'dev-lang/php')
-rw-r--r-- | dev-lang/php/Manifest | 3 | ||||
-rw-r--r-- | dev-lang/php/files/php-8.1.27-implicit-decls.patch | 72 | ||||
-rw-r--r-- | dev-lang/php/php-8.1.27-r2.ebuild (renamed from dev-lang/php/php-8.1.27-r1.ebuild) | 7 |
3 files changed, 81 insertions, 1 deletions
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index d0c184b85ff1..0edef0402aa6 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -1,5 +1,6 @@ AUX 20php5-envd 208 BLAKE2B 7d876903c7f58ab148e1d6bb2b0d86cb9f5ecd241bc00e92138d30e6272b277fddbe2ee233c82e6420c1ea42d493b872d975ed06295ba7502be5c26afa458f5a SHA512 5ddd373d586800a112666b21e449342028ccf60f4f7f1a87f4913e75f718ded881590bed79cbeff75c581a24acb8b46403f2bf496cd05f264b4f9f1e6c5e86fe AUX php-8.1.27-gcc14-libxml.patch 1982 BLAKE2B dcb329e5bae787aa0d47f70e7d60f5a187568b10f2e3a1dd33b5fc422df7b5774e9f4093b728d3621bcdfa2d3d96da98272e80be553cce5ea61151b362347c0a SHA512 f68cb97cc3b0b8da5eb62d7217fcbe1652579771ed19aba0b52740cb056c85710a1b1bff3286dbefa72bc22885dd4b4df8c5f5b1f089c977106251d9daa2065d +AUX php-8.1.27-implicit-decls.patch 2163 BLAKE2B 0164d973ae9b6851014bcccd0deb92add72fa92d9a7c830695841768fb1998c2b49d649503ca324d9735f893974884438b922deab5a4c6c46275057a139ee3ea SHA512 f02d9668ceea39be7b4a6a9c3026d3d0e5230e74aadab09a454a2447a93ea1a4098982d714353c64ec1beb69fe387e9b3575c60fc14e4749298ea674f81401c2 AUX php-8.2.8-openssl-tests.patch 790 BLAKE2B fcfa6f361470f2baa65d2bbbde7c9629841546a560aa6f88d85b68727004e24949f9516340eba0339e575dcf06077d08540a7a6d58a0cda42d5cd26bf48d9e46 SHA512 d29b5334abee8bcbef62c88c01c9eaf887f25901763db75e754f6690e24138c9e45783943d32402f693bd7e4564d737521a8b0b8034d5401bac73ff30f453050 AUX php-capstone-optional.patch 2497 BLAKE2B f23236130be88d28d933d5482f1925c4e32e09c5022544ac2dec62465e9296baabe64f57fedd7ccb9f4499d354bd466d10cfb66596e8be029be6fa4f82dbc1a1 SHA512 a9000d789a7bc54d4b6cf8ed287dcfd71958dfc85c6417737dcd66b9461be5b1aa2568a19f5a9cd29927fe9d955ac24d04e2f64f1c4018110a8f81a6eb4813c5 AUX php-fpm_at-simple.service 316 BLAKE2B 0ba10f3e3b004fbf14956e1e4f04f59b8a127e6717fe6b92c09b9f931033a11551c75fbbee9010f6b694c5a8758ca0eec9eed457ae304ba0dea8f2c256c3b8d4 SHA512 7367a3f8d3874f8e0c76f331ba613a0250db02f60ad9f87affaf448dcb5bc34bcecb91d88f415764a12b24b46ae3d1b738a002af9f77a4b707e916e83a0021fd @@ -11,7 +12,7 @@ DIST php-8.2.15.tar.xz 12075384 BLAKE2B cef15868968538e232093bd66d862a88f0960325 DIST php-8.2.16.tar.xz 12085228 BLAKE2B 6fcf3f5be8443c70e88746fdd609016c322b86ebc0257ee8db0f8551c73804bae2ecb156ee835b09aedb23bb2026658c3f24a8f722dce80e427bdab844bc27ce SHA512 99e5c9eee4c5a35b3e1939c748ded87c8bff4a340d677516ed24dcf4207c51403d38524c46d6e79de5efe90d7368ba82052ec8a29dd5955f549e8198c1e917f6 DIST php-8.3.3.tar.xz 12463880 BLAKE2B ac0baabe875be8ce42c26713f78733140d47f33636aa0e16e2685c83f558afea905707ca133b06ea28ad8de043d7db7d0931259c7c07a2de2c04a935d76db365 SHA512 42141cc46b6abb11fa51cc96c34424cbf9990150b973d84488fa39a07935b22552a1316978f5a4e48762bf3c94eee3d7dfe741c4ee1a12bf752ce1c2660cc8b0 EBUILD php-8.1.26-r1.ebuild 21992 BLAKE2B 6a2d19aefc689f44603bf95a14b21e345ae739a5dd66a620a065f36e4b72233753a8144f41434211de28ee49ac0e3c0dda3dd712749215a721007126104cddfc SHA512 928b5d071618a69d398c15223c8885924c5dbe6581bacc93f041a27c6caf4384ae43e0aeeb6f2bf31582b5d1838a6656a8e6cb24d18ddddf44e9df1e18694c93 -EBUILD php-8.1.27-r1.ebuild 22314 BLAKE2B add80f1f15e96b4e50766354f0d102afcb9ebf421beb0c809090e3e1b9bb2ba95e034d565a29088b443568f0a85993aa67adc016bdb3499a75c80273e01ee539 SHA512 5baee72f37463fbe58f36cf18003ab6d7feca385bfd6df6170137d7046ff3dd9e060a816775675542c7a64a6e2c220a8e5976562f4c317b7f52e4b57824718c4 +EBUILD php-8.1.27-r2.ebuild 22481 BLAKE2B c676a47d00bfe59a69272f5a4cc5dba1a95c778353777f666d20cdf9f998cf90122978aa98a6739e24879f0d778645e8a15123308f79240aaa69fecb6cf262cc SHA512 86e7528fa4a7f6bf698b960bdda0a0db0439d50c3bb44d756940a41f43a747259d1dd6b51206b86f72296d86955721ad69c0cecd8a284bea43c5d282767d8c67 EBUILD php-8.2.15.ebuild 25070 BLAKE2B ff8a58422932b3d8f343c02e7e782e62398f3f8de995814add57adbd7940cacd75635bc565f7782c40fb591680e9d5fdd76bffd7b6596ba9b5aa5e4ad911a016 SHA512 6ea158fed4325e94a5c70f689c8dc88129f7ed35c4c88b57c88408dba765c30f6c0a5bb4d60fc35139a6f667029493fc7884638a679fd18356fb9ae0ce1b3b7a EBUILD php-8.2.16.ebuild 25295 BLAKE2B ca2c800b32e68cbd8e9c4f5d275afb2bfc27c5c0c8fb4ebb57d77acd281f6484c85dfe168c009cbab7eba4792029869bfdfca00835a04e129c27479877da0015 SHA512 452578defe0f44c55fb66d9ae24b46e7d5cbf536258e82f5e2fdc32356be84570e89fe99a13182c4caee5fdaf50d89e29c73b5478cb71ae26ae8712aeb39d0b2 EBUILD php-8.3.3.ebuild 24009 BLAKE2B 777d6bf3fb938135e9e5bde90e49813eca2cd95896785a02b42a84179505150c87211877582e4012a6f29fb67fc0bdad1a3607f1c0a4bc7bf70ae68cea36a5d1 SHA512 b5218ec48794ead1467a114df8e5a5251453834a974fceb99e6c7a947239fb32c8ca2a34e28dc3d84b05d55364503fb640838924d26fce6e417b65d1eefff41a diff --git a/dev-lang/php/files/php-8.1.27-implicit-decls.patch b/dev-lang/php/files/php-8.1.27-implicit-decls.patch new file mode 100644 index 000000000000..443b02ba17c2 --- /dev/null +++ b/dev-lang/php/files/php-8.1.27-implicit-decls.patch @@ -0,0 +1,72 @@ +From 79df2b9dcbe0388667c832b2c702ca3158330ed7 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Mon, 4 Mar 2024 11:48:01 -0500 +Subject: [PATCH] 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. + +(Backport to php-8.1.27) + +Closes GH-10751 +--- + ext/iconv/config.m4 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4 +index ac57c81e..b8044bf2 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() { + printf("%d", _libiconv_version); + return 0; +-- +2.43.0 + diff --git a/dev-lang/php/php-8.1.27-r1.ebuild b/dev-lang/php/php-8.1.27-r2.ebuild index ee3853ec5893..38bbbc21e31c 100644 --- a/dev-lang/php/php-8.1.27-r1.ebuild +++ b/dev-lang/php/php-8.1.27-r2.ebuild @@ -149,6 +149,7 @@ PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" "${FILESDIR}/php-capstone-optional.patch" "${FILESDIR}/php-8.1.27-gcc14-libxml.patch" + "${FILESDIR}/php-8.1.27-implicit-decls.patch" ) # ARM/Windows functions that are expected to be undefined. @@ -158,6 +159,12 @@ QA_CONFIG_IMPL_DECL_SKIP=( _controlfp_s ) +# Functions from alternate iconv implementations (bug 925268) +QA_CONFIG_IMPL_DECL_SKIP+=( + iconv_ccs_init + cstoccsid +) + php_install_ini() { local phpsapi="${1}" |