<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6010db5e55c286c71e1c41ce71205a749771aea6">https://github.com/macports/macports-ports/commit/6010db5e55c286c71e1c41ce71205a749771aea6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6010db5e55c286c71e1c41ce71205a749771aea6
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Tue Apr 16 06:04:10 2024 -0500

<span style='display:block; white-space:pre;color:#404040;'>    php8*: Add -Wno-implicit-fallthrough conditionally
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/69114
</span>---
 lang/php/Portfile                                  | 16 ++++++++
 ...php80-conditional-Wno-implicit-fallthrough.diff | 14 +++++++
 ...php81-conditional-Wno-implicit-fallthrough.diff | 45 ++++++++++++++++++++++
 lang/php/files/patch-php81-opcache.diff            | 23 +++++++++++
 ...php82-conditional-Wno-implicit-fallthrough.diff | 45 ++++++++++++++++++++++
 lang/php/files/patch-php82-opcache.diff            | 23 +++++++++++
 ...php83-conditional-Wno-implicit-fallthrough.diff | 45 ++++++++++++++++++++++
 lang/php/files/patch-php83-opcache.diff            | 23 +++++++++++
 8 files changed, 234 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/Portfile b/lang/php/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 856cc839db5..c9157277a06 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -271,6 +271,18 @@ if {[is_sapi_subport]} {
</span>         patchfiles-append \
                         patch-${php}-atomic.diff
     }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[vercmp ${branch} >= 8.0]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        patch-${php}-conditional-Wno-implicit-fallthrough.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        use_autoreconf  yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        autoreconf.cmd  ./buildconf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        autoreconf.args --debug --force
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        autoreconf.env  "PHP_AUTOCONF=${prefix}/bin/autoconf" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        "PHP_AUTOHEADER=${prefix}/bin/autoheader"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span>     if {[vercmp ${branch} < 7.4]} {
         patchfiles-append \
                         patch-${php}-libxml2-overlinking.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1752,6 +1764,10 @@ if {[vercmp ${branch} >= 5.5]} {
</span>             legacysupport.newest_darwin_requires_legacy 15
         }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[vercmp ${branch} >= 8.1]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            patchfiles-append patch-${php}-opcache.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         post-destroot {
             set docdir ${destroot}${prefix}/share/doc/${subport}
             xinstall -d ${docdir}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php80-conditional-Wno-implicit-fallthrough.diff b/lang/php/files/patch-php80-conditional-Wno-implicit-fallthrough.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e91b9794d69
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php80-conditional-Wno-implicit-fallthrough.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add -Wno-implicit-fallthrough conditionally.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/issues/13330
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/Zend/Zend.m4 2023-08-03 12:13:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Zend/Zend.m4 2024-04-16 06:15:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -172,7 +172,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   AC_DEFINE(ZEND_DEBUG,0,[ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-test -n "$GCC" && CFLAGS="-Wall -Wextra -Wno-strict-aliasing -Wno-implicit-fallthrough -Wno-unused-parameter -Wno-sign-compare $CFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++test -n "$GCC" && CFLAGS="-Wall -Wextra -Wno-strict-aliasing -Wno-unused-parameter -Wno-sign-compare $CFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [CFLAGS="-Wno-implicit-fallthrough $CFLAGS"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Check if compiler supports -Wno-clobbered (only GCC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AX_CHECK_COMPILE_FLAG([-Wno-clobbered], CFLAGS="-Wno-clobbered $CFLAGS", , [-Werror])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php81-conditional-Wno-implicit-fallthrough.diff b/lang/php/files/patch-php81-conditional-Wno-implicit-fallthrough.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2b691570356
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php81-conditional-Wno-implicit-fallthrough.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add -Wno-implicit-fallthrough conditionally.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/issues/13330
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/pull/13331
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ext/date/config0.m4  2024-04-10 00:53:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ext/date/config0.m4  2024-04-16 06:31:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,7 +4,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Check for strtoll, atoll
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_FUNCS(strtoll atoll)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PHP_DATE_CFLAGS="-Wno-implicit-fallthrough -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/parse_posix.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                  lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ext/hash/config.m4   2024-04-10 00:53:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ext/hash/config.m4   2024-04-16 06:31:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,8 +28,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     SHA3_OPT_SRC="$SHA3_DIR/KeccakP-1600-opt64.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   EXT_HASH_SHA3_SOURCES="$SHA3_OPT_SRC $SHA3_DIR/KeccakHash.c $SHA3_DIR/KeccakSponge.c hash_sha3.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   dnl Add -Wno-implicit-fallthrough flag as it happens on 32 bit builds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  PHP_HASH_CFLAGS="-Wno-implicit-fallthrough -I@ext_srcdir@/$SHA3_DIR -DKeccakP200_excluded -DKeccakP400_excluded -DKeccakP800_excluded -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -Wno-implicit-fallthrough"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -I@ext_srcdir@/$SHA3_DIR -DKeccakP200_excluded -DKeccakP400_excluded -DKeccakP800_excluded -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   PHP_ADD_BUILD_DIR(ext/hash/$SHA3_DIR, 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ext/pcre/config0.m4  2024-04-10 00:53:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ext/pcre/config0.m4  2024-04-16 06:31:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,7 +66,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   pcre2lib/pcre2_string_utils.c pcre2lib/pcre2_study.c pcre2lib/pcre2_substitute.c  pcre2lib/pcre2_substring.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   pcre2lib/pcre2_tables.c pcre2lib/pcre2_ucd.c pcre2lib/pcre2_valid_utf.c pcre2lib/pcre2_xclass.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   pcre2lib/pcre2_find_bracket.c pcre2lib/pcre2_convert.c pcre2lib/pcre2_extuni.c pcre2lib/pcre2_script_run.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  PHP_PCRE_CFLAGS="-Wno-implicit-fallthrough -DHAVE_CONFIG_H -I@ext_srcdir@/pcre2lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -Wno-implicit-fallthrough"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -DHAVE_CONFIG_H -I@ext_srcdir@/pcre2lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   AC_DEFINE(PCRE2_CODE_UNIT_WIDTH, 8, [ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php81-opcache.diff b/lang/php/files/patch-php81-opcache.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..abbce584958
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php81-opcache.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add -Wno-implicit-fallthrough conditionally.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/issues/13330
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/pull/13331
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/opcache/config.m4.orig     2024-04-10 00:53:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/opcache/config.m4  2024-04-16 06:01:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -313,6 +313,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   AC_MSG_RESULT([$have_shm_mmap_posix])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_OPCACHE_CFLAGS="$PHP_OPCACHE_CFLAGS -Wno-implicit-fallthrough"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   PHP_NEW_EXTENSION(opcache,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   ZendAccelerator.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   zend_accelerator_blacklist.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -328,7 +330,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   shared_alloc_mmap.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   shared_alloc_posix.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   $ZEND_JIT_SRC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  shared,,"-Wno-implicit-fallthrough -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1",,yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  shared,,"$PHP_OPCACHE_CFLAGS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1",,yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   PHP_ADD_EXTENSION_DEP(opcache, pcre)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php82-conditional-Wno-implicit-fallthrough.diff b/lang/php/files/patch-php82-conditional-Wno-implicit-fallthrough.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a68b172d987
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php82-conditional-Wno-implicit-fallthrough.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add -Wno-implicit-fallthrough conditionally.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/issues/13330
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/pull/13331
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ext/date/config0.m4  2024-04-09 13:46:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ext/date/config0.m4  2024-04-16 06:34:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,7 +4,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Check for strtoll, atoll
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_FUNCS(strtoll atoll)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PHP_DATE_CFLAGS="-Wno-implicit-fallthrough -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/parse_posix.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                  lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ext/hash/config.m4   2024-04-09 13:46:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ext/hash/config.m4   2024-04-16 06:34:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,8 +28,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     SHA3_OPT_SRC="$SHA3_DIR/KeccakP-1600-opt64.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   EXT_HASH_SHA3_SOURCES="$SHA3_OPT_SRC $SHA3_DIR/KeccakHash.c $SHA3_DIR/KeccakSponge.c hash_sha3.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   dnl Add -Wno-implicit-fallthrough flag as it happens on 32 bit builds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  PHP_HASH_CFLAGS="-Wno-implicit-fallthrough -I@ext_srcdir@/$SHA3_DIR -DKeccakP200_excluded -DKeccakP400_excluded -DKeccakP800_excluded -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -Wno-implicit-fallthrough"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -I@ext_srcdir@/$SHA3_DIR -DKeccakP200_excluded -DKeccakP400_excluded -DKeccakP800_excluded -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   PHP_ADD_BUILD_DIR(ext/hash/$SHA3_DIR, 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ext/pcre/config0.m4  2024-04-09 13:46:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ext/pcre/config0.m4  2024-04-16 06:34:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,7 +66,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   pcre2lib/pcre2_string_utils.c pcre2lib/pcre2_study.c pcre2lib/pcre2_substitute.c  pcre2lib/pcre2_substring.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   pcre2lib/pcre2_tables.c pcre2lib/pcre2_ucd.c pcre2lib/pcre2_valid_utf.c pcre2lib/pcre2_xclass.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   pcre2lib/pcre2_find_bracket.c pcre2lib/pcre2_convert.c pcre2lib/pcre2_extuni.c pcre2lib/pcre2_script_run.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  PHP_PCRE_CFLAGS="-Wno-implicit-fallthrough -DHAVE_CONFIG_H -I@ext_srcdir@/pcre2lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -Wno-implicit-fallthrough"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -DHAVE_CONFIG_H -I@ext_srcdir@/pcre2lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   AC_DEFINE(PCRE2_CODE_UNIT_WIDTH, 8, [ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php82-opcache.diff b/lang/php/files/patch-php82-opcache.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..cae911de4ef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php82-opcache.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add -Wno-implicit-fallthrough conditionally.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/issues/13330
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/pull/13331
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/opcache/config.m4.orig     2024-04-09 13:46:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/opcache/config.m4  2024-04-16 06:00:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -317,6 +317,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   AC_MSG_RESULT([$have_shm_mmap_posix])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_OPCACHE_CFLAGS="$PHP_OPCACHE_CFLAGS -Wno-implicit-fallthrough"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   PHP_NEW_EXTENSION(opcache,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   ZendAccelerator.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   zend_accelerator_blacklist.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -332,7 +334,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   shared_alloc_mmap.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   shared_alloc_posix.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   $ZEND_JIT_SRC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  shared,,"-Wno-implicit-fallthrough -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1",,yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  shared,,"$PHP_OPCACHE_CFLAGS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1",,yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   PHP_ADD_EXTENSION_DEP(opcache, pcre)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php83-conditional-Wno-implicit-fallthrough.diff b/lang/php/files/patch-php83-conditional-Wno-implicit-fallthrough.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9ac024bbcd3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php83-conditional-Wno-implicit-fallthrough.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add -Wno-implicit-fallthrough conditionally.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/issues/13330
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/pull/13331
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ext/date/config0.m4  2024-04-09 16:35:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ext/date/config0.m4  2024-04-16 06:34:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,7 +4,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Check for strtoll, atoll
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_FUNCS(strtoll atoll)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PHP_DATE_CFLAGS="-Wno-implicit-fallthrough -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/parse_posix.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                  lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ext/hash/config.m4   2024-04-09 16:35:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ext/hash/config.m4   2024-04-16 06:34:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,8 +24,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     SHA3_OPT_SRC="$SHA3_DIR/KeccakP-1600-opt64.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   EXT_HASH_SHA3_SOURCES="$SHA3_OPT_SRC $SHA3_DIR/KeccakHash.c $SHA3_DIR/KeccakSponge.c hash_sha3.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   dnl Add -Wno-implicit-fallthrough flag as it happens on 32 bit builds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  PHP_HASH_CFLAGS="-Wno-implicit-fallthrough -I@ext_srcdir@/$SHA3_DIR -DKeccakP200_excluded -DKeccakP400_excluded -DKeccakP800_excluded -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -Wno-implicit-fallthrough"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -I@ext_srcdir@/$SHA3_DIR -DKeccakP200_excluded -DKeccakP400_excluded -DKeccakP800_excluded -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   PHP_ADD_BUILD_DIR(ext/hash/$SHA3_DIR, 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ext/pcre/config0.m4  2024-04-09 16:35:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ext/pcre/config0.m4  2024-04-16 06:34:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,7 +66,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   pcre2lib/pcre2_string_utils.c pcre2lib/pcre2_study.c pcre2lib/pcre2_substitute.c  pcre2lib/pcre2_substring.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   pcre2lib/pcre2_tables.c pcre2lib/pcre2_ucd.c pcre2lib/pcre2_valid_utf.c pcre2lib/pcre2_xclass.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   pcre2lib/pcre2_find_bracket.c pcre2lib/pcre2_convert.c pcre2lib/pcre2_extuni.c pcre2lib/pcre2_script_run.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  PHP_PCRE_CFLAGS="-Wno-implicit-fallthrough -DHAVE_CONFIG_H -I@ext_srcdir@/pcre2lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -Wno-implicit-fallthrough"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -DHAVE_CONFIG_H -I@ext_srcdir@/pcre2lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   AC_DEFINE(PCRE2_CODE_UNIT_WIDTH, 8, [ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php83-opcache.diff b/lang/php/files/patch-php83-opcache.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ebe0c52a5f2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php83-opcache.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add -Wno-implicit-fallthrough conditionally.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/issues/13330
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/pull/13331
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/opcache/config.m4.orig     2024-04-09 16:35:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/opcache/config.m4  2024-04-16 05:58:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -300,6 +300,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   AC_MSG_RESULT([$have_shm_mmap_posix])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_OPCACHE_CFLAGS="$PHP_OPCACHE_CFLAGS -Wno-implicit-fallthrough"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   PHP_NEW_EXTENSION(opcache,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   ZendAccelerator.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   zend_accelerator_blacklist.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -315,7 +317,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   shared_alloc_mmap.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   shared_alloc_posix.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   $ZEND_JIT_SRC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  shared,,"-Wno-implicit-fallthrough -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1",,yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  shared,,"$PHP_OPCACHE_CFLAGS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1",,yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   PHP_ADD_EXTENSION_DEP(opcache, pcre)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span></pre><pre style='margin:0'>

</pre>