From 29ff1c66126885e2e8659aba1082b49ed59e256d Mon Sep 17 00:00:00 2001 From: Masakazu Kitajo Date: Tue, 27 Jan 2026 14:59:16 -0700 Subject: [PATCH 1/4] Make 9.2.x buildable on macOS 26 --- configure.ac | 2 +- include/tscore/ink_endian.h | 2 ++ iocore/net/QUICNetVConnection.cc | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 5421df1d0a0..dda125db899 100644 --- a/configure.ac +++ b/configure.ac @@ -885,7 +885,7 @@ case $host_os_def in darwin) AS_IF([test "x$ax_cv_c_compiler_vendor" = "xclang"], [ - common_opt="-pipe -Wall -Wno-deprecated-declarations -Qunused-arguments -Wextra -Wno-ignored-qualifiers -Wno-unused-parameter" + common_opt="-pipe -Wall -Wno-deprecated-declarations -Qunused-arguments -Wextra -Wno-ignored-qualifiers -Wno-unused-parameter -Wno-vla-extension -Wno-cast-function-type-mismatch" debug_opt="-g $common_opt" release_opt="-g $common_opt $optimizing_flags -fno-strict-aliasing" cxx_opt="-Wno-invalid-offsetof" diff --git a/include/tscore/ink_endian.h b/include/tscore/ink_endian.h index 539c8354124..337a0ba44a7 100644 --- a/include/tscore/ink_endian.h +++ b/include/tscore/ink_endian.h @@ -26,8 +26,10 @@ #include "tscore/ink_config.h" #ifdef HAVE_SYS_ENDIAN_H +#if !defined(darwin) #include #endif +#endif #ifdef HAVE_MACHINE_ENDIAN_H #include #endif diff --git a/iocore/net/QUICNetVConnection.cc b/iocore/net/QUICNetVConnection.cc index 5c52a188d3d..17b7d9ad0cf 100644 --- a/iocore/net/QUICNetVConnection.cc +++ b/iocore/net/QUICNetVConnection.cc @@ -1654,7 +1654,6 @@ QUICNetVConnection::_packetize_frames(uint8_t *packet_buf, QUICEncryptionLevel l max_frame_size = std::min(max_frame_size, this->_maximum_stream_frame_data_size()); bool probing = false; - int frame_count = 0; size_t len = 0; Ptr first_block = make_ptr(new_IOBufferBlock()); Ptr last_block = first_block; @@ -1691,7 +1690,6 @@ QUICNetVConnection::_packetize_frames(uint8_t *packet_buf, QUICEncryptionLevel l break; } - ++frame_count; probing |= frame->is_probing_frame(); if (frame->is_flow_controlled()) { int ret = this->_remote_flow_controller->update(this->_stream_manager->total_offset_sent()); From 2dd27ccfd161e02147117b428758eb0997def876 Mon Sep 17 00:00:00 2001 From: Masakazu Kitajo Date: Tue, 27 Jan 2026 16:27:11 -0700 Subject: [PATCH 2/4] Add Wno-cast-function-type-mismatch only if available --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index dda125db899..442b165ae67 100644 --- a/configure.ac +++ b/configure.ac @@ -848,6 +848,9 @@ AS_IF([test "x${has_optimizer_flags}" = "xno"], ] ) +AX_CXX_COMPILE_FLAG([-Wno-cast-function-type-mismatch], [NO_WARN_CAST_FUNCTION_TYPE_MISMATCH="-Wno-cast-function-type-mismatch"], [NO_WARN_CAST_FUNCTION_TYPE_MISMATCH=""]) +AC_SUBST([NO_WARN_CAST_FUNCTION_TYPE_MISMATCH]) + case $host_os_def in linux) AS_IF([test "x$ax_cv_c_compiler_vendor" = "xintel"], [ @@ -885,7 +888,7 @@ case $host_os_def in darwin) AS_IF([test "x$ax_cv_c_compiler_vendor" = "xclang"], [ - common_opt="-pipe -Wall -Wno-deprecated-declarations -Qunused-arguments -Wextra -Wno-ignored-qualifiers -Wno-unused-parameter -Wno-vla-extension -Wno-cast-function-type-mismatch" + common_opt="-pipe -Wall -Wno-deprecated-declarations -Qunused-arguments -Wextra -Wno-ignored-qualifiers -Wno-unused-parameter -Wno-vla-extension $(NO_WARN_CAST_FUNCTION_TYPE_MISMATCH)" debug_opt="-g $common_opt" release_opt="-g $common_opt $optimizing_flags -fno-strict-aliasing" cxx_opt="-Wno-invalid-offsetof" From ca5ac1f5c9a4ab1f331a0f291823047401f47426 Mon Sep 17 00:00:00 2001 From: Masakazu Kitajo Date: Tue, 27 Jan 2026 17:12:55 -0700 Subject: [PATCH 3/4] Check the version by a shell script --- configure.ac | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 442b165ae67..866f07fc67b 100644 --- a/configure.ac +++ b/configure.ac @@ -658,6 +658,11 @@ AM_PROG_AS AX_COMPILER_VENDOR +AC_MSG_CHECKING([for C compiler version]) +# Capture the output of the compiler version command +ac_cv_c_compiler_version=`${CC} --version 2>&1 | grep "Apple clang version" | head -n 1 | awk '{print $4}' | cut -d'.' -f1` +AC_MSG_RESULT([$ac_cv_c_compiler_version]) + AX_CC_FOR_BUILD CFLAGS="${_ts_saved_CFLAGS}" @@ -848,7 +853,7 @@ AS_IF([test "x${has_optimizer_flags}" = "xno"], ] ) -AX_CXX_COMPILE_FLAG([-Wno-cast-function-type-mismatch], [NO_WARN_CAST_FUNCTION_TYPE_MISMATCH="-Wno-cast-function-type-mismatch"], [NO_WARN_CAST_FUNCTION_TYPE_MISMATCH=""]) +AS_IF([test "x$ac_cv_c_compiler_version" = "x17"], [NO_WARN_CAST_FUNCTION_TYPE_MISMATCH="-Wno-cast-function-type-mismatch"], [NO_WARN_CAST_FUNCTION_TYPE_MISMATCH="$ac_cv_c_compiler_version"]) AC_SUBST([NO_WARN_CAST_FUNCTION_TYPE_MISMATCH]) case $host_os_def in @@ -888,7 +893,7 @@ case $host_os_def in darwin) AS_IF([test "x$ax_cv_c_compiler_vendor" = "xclang"], [ - common_opt="-pipe -Wall -Wno-deprecated-declarations -Qunused-arguments -Wextra -Wno-ignored-qualifiers -Wno-unused-parameter -Wno-vla-extension $(NO_WARN_CAST_FUNCTION_TYPE_MISMATCH)" + common_opt="-pipe -Wall -Wno-deprecated-declarations -Qunused-arguments -Wextra -Wno-ignored-qualifiers -Wno-unused-parameter -Wno-vla-extension $NO_WARN_CAST_FUNCTION_TYPE_MISMATCH" debug_opt="-g $common_opt" release_opt="-g $common_opt $optimizing_flags -fno-strict-aliasing" cxx_opt="-Wno-invalid-offsetof" From 81f31b082ead68559c37b15a784b20b045172ae5 Mon Sep 17 00:00:00 2001 From: Masakazu Kitajo Date: Tue, 27 Jan 2026 17:21:49 -0700 Subject: [PATCH 4/4] Remove debug output --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 866f07fc67b..6c249064ec2 100644 --- a/configure.ac +++ b/configure.ac @@ -853,7 +853,7 @@ AS_IF([test "x${has_optimizer_flags}" = "xno"], ] ) -AS_IF([test "x$ac_cv_c_compiler_version" = "x17"], [NO_WARN_CAST_FUNCTION_TYPE_MISMATCH="-Wno-cast-function-type-mismatch"], [NO_WARN_CAST_FUNCTION_TYPE_MISMATCH="$ac_cv_c_compiler_version"]) +AS_IF([test "x$ac_cv_c_compiler_version" = "x17"], [NO_WARN_CAST_FUNCTION_TYPE_MISMATCH="-Wno-cast-function-type-mismatch"], [NO_WARN_CAST_FUNCTION_TYPE_MISMATCH=""]) AC_SUBST([NO_WARN_CAST_FUNCTION_TYPE_MISMATCH]) case $host_os_def in