Skip to content

Update protobuf to 29.6 and remove abseil GCC >14 workarounds #5550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fruffy merged 2 commits into from
Mar 19, 2026
Merged

Update protobuf to 29.6 and remove abseil GCC >14 workarounds #5550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cbc48f
Initial plan
Copilot Mar 19, 2026
e92182f
Update protobuf to 29.6 and remove abseil TODO workarounds
Copilot Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions cmake/Abseil.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,10 @@ macro(p4c_obtain_abseil)
# Do not suppress warnings for Abseil library targets that are aliased.
get_target_property(target_type ${target} TYPE)
if (NOT ${target_type} STREQUAL "INTERFACE_LIBRARY")
# We need this workaround because of https://github.com/abseil/abseil-cpp/issues/1664.
# TODO: Remove once the Abseil compilation issue is fixed.
if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 14)
target_compile_options(${target} PUBLIC "-mbmi")
endif()
target_compile_options(${target} PRIVATE "-Wno-error" "-w")
endif()
endif()
endforeach()
# TODO: Remove once the Abseil compilation issue is fixed.
if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 14)
message(WARNING "Compiling with GCC > 14. Adding -mbmi to Abseil targets, this may cause incompatibility with old CPUs.")
endif()

# Reset temporary variable modifications.
set(CMAKE_UNITY_BUILD ${CMAKE_UNITY_BUILD_PREV})
set(FETCHCONTENT_QUIET ${FETCHCONTENT_QUIET_PREV})
Expand Down
4 changes: 2 additions & 2 deletions cmake/Protobuf.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
macro(p4c_obtain_protobuf)
set(P4C_PROTOBUF_VERSION 25.3)
set(P4C_PROTOBUF_VERSION 29.6)
option(
P4C_USE_PREINSTALLED_PROTOBUF
"Look for a preinstalled version of Protobuf in the system instead of installing a prebuilt binary using FetchContent."
Expand Down Expand Up @@ -63,7 +63,7 @@ macro(p4c_obtain_protobuf)
fetchcontent_declare(
protobuf
URL https://github.com/protocolbuffers/protobuf/releases/download/v${P4C_PROTOBUF_VERSION}/protobuf-${P4C_PROTOBUF_VERSION}.tar.gz
URL_HASH SHA256=d19643d265b978383352b3143f04c0641eea75a75235c111cc01a1350173180e
URL_HASH SHA256=877bf9f880631aa31daf2c09896276985696728137fcd43cc534a28c5566d9ba
USES_TERMINAL_DOWNLOAD TRUE
GIT_PROGRESS TRUE
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
Expand Down