deps: bump abseil-cpp to 20250127.0

2025-03-13 15:45:20 +01:00
parent 77a28070b9
commit 0d035168ea
9 changed files with 40 additions and 25 deletions
--- a/Dependencies.txt
+++ b/Dependencies.txt
@@ -1,5 +1,5 @@
 ZLIB=1.3.1
-abseil-cpp=20240722.0
+abseil-cpp=20250127.0
 Protobuf=v29.3
 Eigen=3.4.0
 Re2=2024-04-01
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -8,38 +8,37 @@
 OR_TOOLS_VERSION = "9.12"

 module(
-    name = "ortools",
+    name = "or-tools",
    version = OR_TOOLS_VERSION,
-    repo_name = "com_google_ortools",
 )

 # see https://registry.bazel.build/
-bazel_dep(name = "abseil-cpp", version = "20240722.0.bcr.2", repo_name = "com_google_absl")
+bazel_dep(name = "abseil-cpp", version = "20250127.0", repo_name = "com_google_absl")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
-bazel_dep(name = "contrib_rules_jvm", version = "0.27.0")
-bazel_dep(name = "eigen", version = "3.4.0.bcr.2")
-bazel_dep(name = "fuzztest", version = "20241028.0", repo_name = "com_google_fuzztest")
-bazel_dep(name = "gazelle", version = "0.39.1", repo_name = "bazel_gazelle")
-bazel_dep(name = "glpk", version = "5.0.bcr.2")
-bazel_dep(name = "google_benchmark", version = "1.8.5", repo_name = "com_google_benchmark")
-bazel_dep(name = "googletest", version = "1.15.2", repo_name = "com_google_googletest")
+bazel_dep(name = "contrib_rules_jvm", version = "0.28.0")
+bazel_dep(name = "eigen", version = "4.0.0-20241125.bcr.1")
+bazel_dep(name = "fuzztest", version = "20250214.0", repo_name = "com_google_fuzztest")
+bazel_dep(name = "gazelle", version = "0.42.0", repo_name = "bazel_gazelle")
+bazel_dep(name = "glpk", version = "5.0.bcr.3")
+bazel_dep(name = "google_benchmark", version = "1.9.1", repo_name = "com_google_benchmark")
+bazel_dep(name = "googletest", version = "1.16.0", repo_name = "com_google_googletest")
 bazel_dep(name = "highs", version = "1.9.0")
-bazel_dep(name = "platforms", version = "0.0.10")
+bazel_dep(name = "platforms", version = "0.0.11")
 bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf")
 bazel_dep(name = "pybind11_abseil", version = "202402.0")
 bazel_dep(name = "pybind11_bazel", version = "2.13.6")
 bazel_dep(name = "pybind11_protobuf", version = "0.0.0-20240524-1d7a729")
-bazel_dep(name = "re2", version = "2024-07-02", repo_name = "com_google_re2")
+bazel_dep(name = "re2", version = "2024-07-02.bcr.1", repo_name = "com_google_re2")
 bazel_dep(name = "rules_cc", version = "0.1.1")
-bazel_dep(name = "rules_go", version = "0.50.1", repo_name = "io_bazel_rules_go")
-bazel_dep(name = "rules_java", version = "8.6.3")
-bazel_dep(name = "rules_jvm_external", version = "6.6")
+bazel_dep(name = "rules_go", version = "0.53.0", repo_name = "io_bazel_rules_go")
+bazel_dep(name = "rules_java", version = "8.9.0")
+bazel_dep(name = "rules_jvm_external", version = "6.7")
 bazel_dep(name = "rules_license", version = "1.0.0")
 bazel_dep(name = "rules_proto", version = "7.1.0")
-bazel_dep(name = "rules_python", version = "1.0.0")
+bazel_dep(name = "rules_python", version = "1.2.0")
 bazel_dep(name = "scip", version = "9.2.1")
 bazel_dep(name = "swig", version = "4.3.0")
-bazel_dep(name = "zlib", version = "1.3.1.bcr.4")
+bazel_dep(name = "zlib", version = "1.3.1.bcr.5")

 git_override(
    module_name = "pybind11_abseil",
--- a/cmake/dependencies/CMakeLists.txt
+++ b/cmake/dependencies/CMakeLists.txt
@@ -78,16 +78,21 @@ endif()
 if(BUILD_absl)
  message(CHECK_START "Fetching Abseil-cpp")
  list(APPEND CMAKE_MESSAGE_INDENT "  ")
-  set(ABSL_ENABLE_INSTALL ON)
  set(ABSL_USE_SYSTEM_INCLUDES ON)
+  # We want Abseil to declare what C++ standard it was compiled with.
  set(ABSL_PROPAGATE_CXX_STD ON)
+  # We want Abseil to keep the INSTALL rules enabled, even though it is a
+  # subproject. Otherwise the install rules in this project break.
+  set(ABSL_ENABLE_INSTALL ON)
  set(ABSL_BUILD_TESTING OFF)
  FetchContent_Declare(
    absl
    GIT_REPOSITORY "https://github.com/abseil/abseil-cpp.git"
-    GIT_TAG "20240722.0"
+    GIT_TAG "20250127.0"
    GIT_SHALLOW TRUE
-    PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/abseil-cpp-20240722.0.patch"
+    PATCH_COMMAND git apply --ignore-whitespace
+    "${CMAKE_CURRENT_LIST_DIR}/../../patches/abseil-cpp-20250127.0.patch"
+    OVERRIDE_FIND_PACKAGE
  )
  FetchContent_MakeAvailable(absl)
  list(POP_BACK CMAKE_MESSAGE_INDENT)
--- a/cmake/host.CMakeLists.txt
+++ b/cmake/host.CMakeLists.txt
@@ -102,11 +102,14 @@ list(APPEND CMAKE_MESSAGE_INDENT "  ")
 set(ABSL_ENABLE_INSTALL ON)
 set(ABSL_USE_SYSTEM_INCLUDES ON)
 set(ABSL_PROPAGATE_CXX_STD ON)
+set(ABSL_BUILD_TESTING OFF)
 FetchContent_Declare(
  absl
  GIT_REPOSITORY "https://github.com/abseil/abseil-cpp.git"
-  GIT_TAG "20240722.0"
-  PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/abseil-cpp-20240722.0.patch")
+  GIT_TAG "20250127.0"
+  GIT_SHALLOW TRUE
+  PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/abseil-cpp-20250127.0.patch"
+)
 FetchContent_MakeAvailable(absl)
 list(POP_BACK CMAKE_MESSAGE_INDENT)
 message(CHECK_PASS "fetched")
@@ -122,8 +125,10 @@ FetchContent_Declare(
  protobuf
  GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
  GIT_TAG "v29.3"
+  GIT_SHALLOW TRUE
  GIT_SUBMODULES ""
-  PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v29.3.patch")
+  PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v29.3.patch"
+)
 FetchContent_MakeAvailable(protobuf)
 list(POP_BACK CMAKE_MESSAGE_INDENT)
 message(CHECK_PASS "fetched")
--- a/cmake/java.cmake
+++ b/cmake/java.cmake
@@ -365,6 +365,7 @@ add_custom_command(
    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_format>>
    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_globals>>
    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_log_sink_set>>
+    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_structured_proto>>
    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_message>>
    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_nullguard>>
    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_proto>>
@@ -397,6 +398,7 @@ add_custom_command(
    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::synchronization>>
    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::throw_delegate>>
    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::time>>
+    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::tracing_internal>>
    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::time_zone>>
    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::utf8_for_code_point>>
    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::vlog_config_internal>>
--- a/cmake/python.cmake
+++ b/cmake/python.cmake
@@ -521,6 +521,7 @@ add_custom_command(
    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_format>>
    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_globals>>
    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_log_sink_set>>
+    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_structured_proto>>
    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_message>>
    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_nullguard>>
    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_proto>>
@@ -554,6 +555,7 @@ add_custom_command(
    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::throw_delegate>>
    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::time>>
    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::time_zone>>
+    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::tracing_internal>>
    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::utf8_for_code_point>>
    $<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::vlog_config_internal>>
    $<${need_windows_absl_lib}:$<TARGET_FILE:absl::abseil_dll>>
--- a/ortools/dotnet/Google.OrTools.runtime.csproj.in
+++ b/ortools/dotnet/Google.OrTools.runtime.csproj.in
@@ -78,6 +78,7 @@
      $<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_format>>
      $<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_globals>>
      $<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_log_sink_set>>
+      $<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_structured_proto>>
      $<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_message>>
      $<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_nullguard>>
      $<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_proto>>
@@ -111,6 +112,7 @@
      $<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::throw_delegate>>
      $<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::time>>
      $<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::time_zone>>
+      $<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::tracing_internal>>
      $<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::utf8_for_code_point>>
      $<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::vlog_config_internal>>
      $<@need_windows_absl_lib@:;$<TARGET_FILE:absl::abseil_dll>>
--- a/patches/BUILD.bazel
+++ b/patches/BUILD.bazel
@@ -12,7 +12,7 @@
 # limitations under the License.

 exports_files([
-    "abseil-cpp-20240722.0.patch",
+    "abseil-cpp-20250127.0.patch",
    "highs-v1.9.0.patch",
    "protobuf-v29.3.patch",
    "pybind11_abseil.patch",
--- a/patches/abseil-cpp-20250127.0.patch
+++ b/patches/abseil-cpp-20250127.0.patch