CMake: Update deps and adjust build config

cblichmann · copybara-github · commit 24d439868602 · 2026-04-19T23:56:27.000-07:00
Same as with the previous Bazel change:
- Update Abseil to 20260107.1.
- Update Benchmark to v1.9.5.
- Update GoogleTest to v1.17.0.
- Update libffi to v3.4.7 and adjust included files.
- Update libunwind to v1.8.3 and adjust included files.
- Update Protobuf to v34.1.
- Update zlib to v1.3.2.

Drive-by:
- Use `std::nullptr_t` in sandbox.h.
PiperOrigin-RevId: 902448120
Change-Id: I8742273dbc0a546461610055ff7113dfc7891fad
diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 FetchContent_Declare(absl
-  URL https://github.com/abseil/abseil-cpp/releases/download/20260107.0/abseil-cpp-20260107.0.tar.gz
-  URL_HASH SHA256=4c124408da902be896a2f368042729655709db5e3004ec99f57e3e14439bc1b2
+  URL https://github.com/abseil/abseil-cpp/releases/download/20260107.1/abseil-cpp-20260107.1.tar.gz
+  URL_HASH SHA256=4314e2a7cbac89cac25a2f2322870f343d81579756ceff7f431803c2c9090195
 )
 set(ABSL_CXX_STANDARD ${SAPI_CXX_STANDARD} CACHE STRING "" FORCE)
 set(ABSL_PROPAGATE_CXX_STD ON CACHE BOOL "" FORCE)
diff --git a/cmake/benchmark.cmake b/cmake/benchmark.cmake
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 FetchContent_Declare(benchmark
-  URL https://github.com/google/benchmark/archive/604f6fd3f4b34a84ec4eb4db81d842fa4db829cd.zip  # 2023-05-30
-  URL_HASH SHA256=342705876335bf894147e052d0dac141fe15962034b41bef5aa59c4b279ca89c
+  URL https://github.com/google/benchmark/archive/refs/tags/v1.9.5.tar.gz
+  URL_HASH SHA256=9631341c82bac4a288bef951f8b26b41f69021794184ece969f8473977eaa340
 )
 set(BENCHMARK_ENABLE_TESTING OFF)
 set(BENCHMARK_ENABLE_EXCEPTIONS OFF)
diff --git a/cmake/googletest.cmake b/cmake/googletest.cmake
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 FetchContent_Declare(googletest
-  URL https://github.com/google/googletest/archive/334704df263b480a3e9e7441ed3292a5e30a37ec.zip  # 2023-06-06
-  URL_HASH SHA256=a217118c2c36a3632b594af7ff98111a65bb2b980b726a7fa62305e02a998440
+  URL https://github.com/google/googletest/releases/download/v1.17.0/googletest-1.17.0.tar.gz
+  URL_HASH SHA256=65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c
 )
 FetchContent_MakeAvailable(googletest)
diff --git a/cmake/libffi.cmake b/cmake/libffi.cmake
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 FetchContent_Declare(libffi
-  URL      https://github.com/libffi/libffi/releases/download/v3.3-rc2/libffi-3.3-rc2.tar.gz
-  URL_HASH SHA256=653ffdfc67fbb865f39c7e5df2a071c0beb17206ebfb0a9ecb18a18f63f6b263
+  URL      https://github.com/libffi/libffi/releases/download/v3.4.7/libffi-3.4.7.tar.gz
+  URL_HASH SHA256=138607dee268bdecf374adf9144c00e839e38541f75f24a1fcf18b78fda48b2d
 )
 FetchContent_GetProperties(libffi)
 if(NOT libffi_POPULATED)
@@ -81,11 +81,13 @@ add_library(ffi STATIC
   ${libffi_SOURCE_DIR}/include/ffi_cfi.h
   ${libffi_SOURCE_DIR}/include/ffi_common.h
   ${libffi_SOURCE_DIR}/include/ffitarget.h
+  ${libffi_SOURCE_DIR}/include/tramp.h
   ${libffi_SOURCE_DIR}/src/closures.c
   ${libffi_SOURCE_DIR}/src/debug.c
   ${libffi_SOURCE_DIR}/src/java_raw_api.c
   ${libffi_SOURCE_DIR}/src/prep_cif.c
   ${libffi_SOURCE_DIR}/src/raw_api.c
+  ${libffi_SOURCE_DIR}/src/tramp.c
   ${libffi_SOURCE_DIR}/src/types.c
   ${_ffi_platform_srcs}
 )
diff --git a/cmake/libunwind.cmake b/cmake/libunwind.cmake
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 FetchContent_Declare(libunwind
-  URL https://github.com/libunwind/libunwind/releases/download/v1.6.2/libunwind-1.6.2.tar.gz
-  URL_HASH SHA256=4a6aec666991fb45d0889c44aede8ad6eb108071c3554fcdff671f9c94794976
+  URL https://github.com/libunwind/libunwind/releases/download/v1.8.3/libunwind-1.8.3.tar.gz
+  URL_HASH SHA256=be30d910e67f58d82e753231f1357f326a1a088acf126b21ff77e60aab19b90b
 )
 FetchContent_GetProperties(libunwind)
 if(NOT libunwind_POPULATED)
@@ -136,7 +136,6 @@ add_library(unwind_ptrace STATIC
   ${libunwind_SOURCE_DIR}/src/elfxx.h
   ${libunwind_SOURCE_DIR}/src/os-linux.h
   ${libunwind_SOURCE_DIR}/src/x86_64/init.h
-  ${libunwind_SOURCE_DIR}/src/x86_64/offsets.h
   ${libunwind_SOURCE_DIR}/src/x86_64/ucontext_i.h
   ${libunwind_SOURCE_DIR}/src/x86_64/unwind_i.h
   # included_sources
@@ -151,13 +150,15 @@ add_library(unwind_ptrace STATIC
   ${libunwind_SOURCE_DIR}/src/dwarf/Gparser.c
   ${libunwind_SOURCE_DIR}/src/dwarf/Gpe.c
   ${libunwind_SOURCE_DIR}/src/dwarf/global.c
+  ${libunwind_SOURCE_DIR}/src/mi/Gaddress_validator.c
   ${libunwind_SOURCE_DIR}/src/mi/Gdestroy_addr_space.c
   ${libunwind_SOURCE_DIR}/src/mi/Gdyn-extract.c
   ${libunwind_SOURCE_DIR}/src/mi/Gfind_dynamic_proc_info.c
   ${libunwind_SOURCE_DIR}/src/mi/Gget_accessors.c
   ${libunwind_SOURCE_DIR}/src/mi/Gget_proc_name.c
   ${libunwind_SOURCE_DIR}/src/mi/Gget_reg.c
   ${libunwind_SOURCE_DIR}/src/mi/Gput_dynamic_unwind_info.c
+  ${libunwind_SOURCE_DIR}/src/mi/Gset_reg.c
   ${libunwind_SOURCE_DIR}/src/mi/flush_cache.c
   ${libunwind_SOURCE_DIR}/src/mi/init.c
   ${libunwind_SOURCE_DIR}/src/mi/mempool.c
@@ -174,8 +175,10 @@ add_library(unwind_ptrace STATIC
   ${libunwind_SOURCE_DIR}/src/ptrace/_UPT_elf.c
   ${libunwind_SOURCE_DIR}/src/ptrace/_UPT_find_proc_info.c
   ${libunwind_SOURCE_DIR}/src/ptrace/_UPT_get_dyn_info_list_addr.c
+  ${libunwind_SOURCE_DIR}/src/ptrace/_UPT_get_elf_filename.c
   ${libunwind_SOURCE_DIR}/src/ptrace/_UPT_get_proc_name.c
   ${libunwind_SOURCE_DIR}/src/ptrace/_UPT_internal.h
+  ${libunwind_SOURCE_DIR}/src/ptrace/_UPT_ptrauth_insn_mask.c
   ${libunwind_SOURCE_DIR}/src/ptrace/_UPT_put_unwind_info.c
   ${libunwind_SOURCE_DIR}/src/ptrace/_UPT_reg_offset.c
   ${libunwind_SOURCE_DIR}/src/ptrace/_UPT_resume.c
diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 FetchContent_Declare(protobuf
-  URL https://github.com/protocolbuffers/protobuf/archive/refs/tags/v31.0.tar.gz # 2025-05-14
-  URL_HASH SHA256=2b695cb1eaef8e173f884235ee6d55f57186e95d89ebb31361ee55cb5fd1b996
+  URL https://github.com/protocolbuffers/protobuf/releases/download/v34.1/protobuf-34.1.tar.gz
+  URL_HASH SHA256=e4e6ff10760cf747a2decd1867741f561b216bd60cc4038c87564713a6da1848
 )
 
 set(protobuf_ABSL_PROVIDER "package" CACHE STRING "" FORCE)
diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 FetchContent_Declare(zlib
-  URL      https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz
-  URL_HASH SHA256=9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
+  URL      https://github.com/madler/zlib/releases/download/v1.3.2/zlib-1.3.2.tar.gz
+  URL_HASH SHA256=bb329a0a2cd0274d05519d61c667c062e06990d72e125ee2dfa8de64f0119d16
 )
 FetchContent_MakeAvailable(zlib)
 
diff --git a/sandboxed_api/sandbox.h b/sandboxed_api/sandbox.h
@@ -43,7 +43,7 @@ class PtrOrCallable {
  public:
   explicit PtrOrCallable(v::Callable* callable) : callable_(callable) {}
   explicit PtrOrCallable(v::Ptr* ptr) : ptr_(ptr) {}
-  explicit PtrOrCallable(nullptr_t) : ptr_(nullptr) {}
+  explicit PtrOrCallable(std::nullptr_t) : ptr_(nullptr) {}
 
   bool IsCallable() const { return callable_ != nullptr; }
   bool IsPtr() const { return !IsCallable(); }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`# limitations under the License.`
`14`	`14`
`15`	`15`	`FetchContent_Declare(googletest`
`16`		`- URL https://github.com/google/googletest/archive/334704df263b480a3e9e7441ed3292a5e30a37ec.zip # 2023-06-06`
`17`		`- URL_HASH SHA256=a217118c2c36a3632b594af7ff98111a65bb2b980b726a7fa62305e02a998440`
	`16`	`+ URL https://github.com/google/googletest/releases/download/v1.17.0/googletest-1.17.0.tar.gz`
	`17`	`+ URL_HASH SHA256=65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c`
`18`	`18`	`)`
`19`	`19`	`FetchContent_MakeAvailable(googletest)`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@`
`13`	`13`	`# limitations under the License.`
`14`	`14`
`15`	`15`	`FetchContent_Declare(protobuf`
`16`		`- URL https://github.com/protocolbuffers/protobuf/archive/refs/tags/v31.0.tar.gz # 2025-05-14`
`17`		`- URL_HASH SHA256=2b695cb1eaef8e173f884235ee6d55f57186e95d89ebb31361ee55cb5fd1b996`
	`16`	`+ URL https://github.com/protocolbuffers/protobuf/releases/download/v34.1/protobuf-34.1.tar.gz`
	`17`	`+ URL_HASH SHA256=e4e6ff10760cf747a2decd1867741f561b216bd60cc4038c87564713a6da1848`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`set(protobuf_ABSL_PROVIDER "package" CACHE STRING "" FORCE)`