You've already forked macports-ports
mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
Ryan Carsten Schmidt
46 lines
2.7 KiB
Diff
46 lines
2.7 KiB
Diff
Add -Wno-implicit-fallthrough conditionally.
|
|
https://github.com/php/php-src/issues/13330
|
|
https://github.com/php/php-src/pull/13331
|
|
--- a/ext/date/config0.m4 2024-04-10 00:53:50.000000000 -0500
|
|
+++ b/ext/date/config0.m4 2024-04-16 06:31:32.000000000 -0500
|
|
@@ -4,7 +4,9 @@
|
|
dnl Check for strtoll, atoll
|
|
AC_CHECK_FUNCS(strtoll atoll)
|
|
|
|
-PHP_DATE_CFLAGS="-Wno-implicit-fallthrough -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
|
|
+AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough"],,[-Werror])
|
|
+
|
|
+PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
|
|
timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/parse_posix.c
|
|
lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
|
|
|
|
--- a/ext/hash/config.m4 2024-04-10 00:53:50.000000000 -0500
|
|
+++ b/ext/hash/config.m4 2024-04-16 06:31:32.000000000 -0500
|
|
@@ -28,8 +28,11 @@
|
|
SHA3_OPT_SRC="$SHA3_DIR/KeccakP-1600-opt64.c"
|
|
])
|
|
EXT_HASH_SHA3_SOURCES="$SHA3_OPT_SRC $SHA3_DIR/KeccakHash.c $SHA3_DIR/KeccakSponge.c hash_sha3.c"
|
|
+
|
|
dnl Add -Wno-implicit-fallthrough flag as it happens on 32 bit builds
|
|
- PHP_HASH_CFLAGS="-Wno-implicit-fallthrough -I@ext_srcdir@/$SHA3_DIR -DKeccakP200_excluded -DKeccakP400_excluded -DKeccakP800_excluded -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
|
|
+ AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -Wno-implicit-fallthrough"],,[-Werror])
|
|
+
|
|
+ PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -I@ext_srcdir@/$SHA3_DIR -DKeccakP200_excluded -DKeccakP400_excluded -DKeccakP800_excluded -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
|
|
|
|
PHP_ADD_BUILD_DIR(ext/hash/$SHA3_DIR, 1)
|
|
fi
|
|
--- a/ext/pcre/config0.m4 2024-04-10 00:53:50.000000000 -0500
|
|
+++ b/ext/pcre/config0.m4 2024-04-16 06:31:32.000000000 -0500
|
|
@@ -66,7 +66,10 @@
|
|
pcre2lib/pcre2_string_utils.c pcre2lib/pcre2_study.c pcre2lib/pcre2_substitute.c pcre2lib/pcre2_substring.c \
|
|
pcre2lib/pcre2_tables.c pcre2lib/pcre2_ucd.c pcre2lib/pcre2_valid_utf.c pcre2lib/pcre2_xclass.c \
|
|
pcre2lib/pcre2_find_bracket.c pcre2lib/pcre2_convert.c pcre2lib/pcre2_extuni.c pcre2lib/pcre2_script_run.c"
|
|
- PHP_PCRE_CFLAGS="-Wno-implicit-fallthrough -DHAVE_CONFIG_H -I@ext_srcdir@/pcre2lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
|
|
+
|
|
+ AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -Wno-implicit-fallthrough"],,[-Werror])
|
|
+
|
|
+ PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -DHAVE_CONFIG_H -I@ext_srcdir@/pcre2lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
|
|
AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
|
|
AC_DEFINE(PCRE2_CODE_UNIT_WIDTH, 8, [ ])
|
|
|