diff options
| author |   Michael Orlitzky <mjo@gentoo.org> | 2024-02-18 17:57:48 -0500 |
|---|---|---|
| committer | Michael Orlitzky <mjo@gentoo.org> | 2024-02-18 18:54:38 -0500 |
| commit | 4a5ef8029ab6211cfc7b710e1c0e49375dd1d0a7 (patch) | |
| tree | 01cdd981f13479072ad660796eb7c5d81f10c2ad /dev-lang/php | |
| parent | dev-lang/php: whitelist some implicit function declarations for php-8.1.x (diff) | |
| download | gentoo-4a5ef8029ab6211cfc7b710e1c0e49375dd1d0a7.tar.gz gentoo-4a5ef8029ab6211cfc7b710e1c0e49375dd1d0a7.tar.bz2 gentoo-4a5ef8029ab6211cfc7b710e1c0e49375dd1d0a7.zip | |
dev-lang/php: replace 8.2.15-r1 and 8.3.2-r1 with 8.2.16 and 8.3.3
Closes: https://bugs.gentoo.org/923335
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
Diffstat (limited to 'dev-lang/php')
| -rw-r--r-- | dev-lang/php/Manifest | 3 | ||||
| -rw-r--r-- | dev-lang/php/files/php-8.2.15-gcc14-build-fix.patch | 16 | ||||
| -rw-r--r-- | dev-lang/php/php-8.2.16.ebuild (renamed from dev-lang/php/php-8.2.15-r1.ebuild) | 8 | ||||
| -rw-r--r-- | dev-lang/php/php-8.3.3.ebuild (renamed from dev-lang/php/php-8.3.2-r1.ebuild) | 8 |
4 files changed, 16 insertions, 19 deletions
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index f0d120a348b5..1924401cad65 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -1,4 +1,5 @@ DIST php-8.1.26.tar.xz 11809448 BLAKE2B e1d50f1de572580a207586b3c3b57081f7b9f1b680ffe8f9e82c88c9285af117dd7e9e2576fcb13119176cb9cd02b39481b6f40e9a1df81aa90b8c4d3e59e4b1 SHA512 5bc40077e57c0fccdf17810d688baea416f22ac248bb01b73d2e2590fc4cfabc7001c1c3833281a60870c74178f7b06cbc85474eba695aabf969ad0081a98417 DIST php-8.1.27.tar.xz 11915228 BLAKE2B 83f4f3c25435b26dc526dc1fd7aff44cd03157349f9bb6454e216525a16c2bbc3bfac47cce6b5ea8bfdfcf3c7f27e342fc602ca7d2491fe89db06ea93f686f0e SHA512 07fb2b8e10e2487635e26bfd8a27949a26b85f76bc3984ad8599224bb7a7f9498d84299335ae5a0bba16599275e9747ab141f73f4f2076ddf49ebec8e76fd0ed DIST php-8.2.15.tar.xz 12075384 BLAKE2B cef15868968538e232093bd66d862a88f0960325f2274eaf53a3d114d01787c58844aa3bce8bc09a723acd95801e1935a60e79fc189317e7f1ba19196dbfcdc4 SHA512 56c94bcafe07cf4bf5eb5fc6c67fcf16654c44a262ffb18188fc3ffac5e9bb11d39093bfb26c26bc8d2dec7e530d1a175180909262c9b5c30130cf5a4a293166 -DIST php-8.3.2.tar.xz 12440200 BLAKE2B 90ab2fe220d99cc1da47162e04c768dc35ed4044ea9154f67bbc9124372859b85a33270bc38d41e9ab28df4b0defaf0e78cffe8eb8bd6fdfbec296a31ea4beab SHA512 acf9013d35ae639558fd4816d12dcae03f8af7944c2639f33cd33517503c6170d30101da6c72ebdaf5542bcaf858a54a22ecc8f86822a128f52938bd6ea9606c +DIST php-8.2.16.tar.xz 12085228 BLAKE2B 6fcf3f5be8443c70e88746fdd609016c322b86ebc0257ee8db0f8551c73804bae2ecb156ee835b09aedb23bb2026658c3f24a8f722dce80e427bdab844bc27ce SHA512 99e5c9eee4c5a35b3e1939c748ded87c8bff4a340d677516ed24dcf4207c51403d38524c46d6e79de5efe90d7368ba82052ec8a29dd5955f549e8198c1e917f6 +DIST php-8.3.3.tar.xz 12463880 BLAKE2B ac0baabe875be8ce42c26713f78733140d47f33636aa0e16e2685c83f558afea905707ca133b06ea28ad8de043d7db7d0931259c7c07a2de2c04a935d76db365 SHA512 42141cc46b6abb11fa51cc96c34424cbf9990150b973d84488fa39a07935b22552a1316978f5a4e48762bf3c94eee3d7dfe741c4ee1a12bf752ce1c2660cc8b0 diff --git a/dev-lang/php/files/php-8.2.15-gcc14-build-fix.patch b/dev-lang/php/files/php-8.2.15-gcc14-build-fix.patch deleted file mode 100644 index 5f21f442ee06..000000000000 --- a/dev-lang/php/files/php-8.2.15-gcc14-build-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://github.com/php/php-src/commit/72526609413e8a8cd768ed4966c17b1a9db6c12c.patch -From: Remi Collet <remi@remirepo.net> -Date: Mon, 22 Jan 2024 10:01:25 +0100 -Subject: [PATCH] Fix GH-13215 GCC 14 build - ---- a/Zend/zend_atomic.h -+++ b/Zend/zend_atomic.h -@@ -23,7 +23,7 @@ - ((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || (__GNUC__ > (x))) - - /* Builtins are used to avoid library linkage */ --#if __has_feature(c_atomic) -+#if __has_feature(c_atomic) && defined(__clang__) - #define HAVE_C11_ATOMICS 1 - #elif ZEND_GCC_PREREQ(4, 7) - #define HAVE_GNUC_ATOMICS 1 diff --git a/dev-lang/php/php-8.2.15-r1.ebuild b/dev-lang/php/php-8.2.16.ebuild index 66bb272f5852..b577e38682dd 100644 --- a/dev-lang/php/php-8.2.15-r1.ebuild +++ b/dev-lang/php/php-8.2.16.ebuild @@ -150,7 +150,13 @@ PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" "${FILESDIR}/php-capstone-optional.patch" "${FILESDIR}/php-8.2.8-openssl-tests.patch" - "${FILESDIR}/php-8.2.15-gcc14-build-fix.patch" +) + +# ARM/Windows functions that are expected to be undefined. +QA_CONFIG_IMPL_DECL_SKIP=( + __crc32d + _controlfp + _controlfp_s ) php_install_ini() { diff --git a/dev-lang/php/php-8.3.2-r1.ebuild b/dev-lang/php/php-8.3.3.ebuild index e2dff19d343f..c914d8167246 100644 --- a/dev-lang/php/php-8.3.2-r1.ebuild +++ b/dev-lang/php/php-8.3.3.ebuild @@ -149,7 +149,13 @@ PHP_MV="$(ver_cut 1)" PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" - "${FILESDIR}/php-8.2.15-gcc14-build-fix.patch" +) + +# ARM/Windows functions that are expected to be undefined. +QA_CONFIG_IMPL_DECL_SKIP=( + __crc32d + _controlfp + _controlfp_s ) php_install_ini() { |