Skip to content

Commit 0d03516

Browse files
MizuxMizux
committed
deps: bump abseil-cpp to 20250127.0
1 parent 77a2807 commit 0d03516

9 files changed

+40
-25
lines changed

‎Dependencies.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ZLIB=1.3.1
2-
abseil-cpp=20240722.0
2+
abseil-cpp=20250127.0
33
Protobuf=v29.3
44
Eigen=3.4.0
55
Re2=2024-04-01

‎MODULE.bazel

+16-17
Original file line numberDiff line numberDiff line change
@@ -8,38 +8,37 @@
88
OR_TOOLS_VERSION = "9.12"
99

1010
module(
11-
name = "ortools",
11+
name = "or-tools",
1212
version = OR_TOOLS_VERSION,
13-
repo_name = "com_google_ortools",
1413
)
1514

1615
# see https://registry.bazel.build/
17-
bazel_dep(name = "abseil-cpp", version = "20240722.0.bcr.2", repo_name = "com_google_absl")
16+
bazel_dep(name = "abseil-cpp", version = "20250127.0", repo_name = "com_google_absl")
1817
bazel_dep(name = "bazel_skylib", version = "1.7.1")
19-
bazel_dep(name = "contrib_rules_jvm", version = "0.27.0")
20-
bazel_dep(name = "eigen", version = "3.4.0.bcr.2")
21-
bazel_dep(name = "fuzztest", version = "20241028.0", repo_name = "com_google_fuzztest")
22-
bazel_dep(name = "gazelle", version = "0.39.1", repo_name = "bazel_gazelle")
23-
bazel_dep(name = "glpk", version = "5.0.bcr.2")
24-
bazel_dep(name = "google_benchmark", version = "1.8.5", repo_name = "com_google_benchmark")
25-
bazel_dep(name = "googletest", version = "1.15.2", repo_name = "com_google_googletest")
18+
bazel_dep(name = "contrib_rules_jvm", version = "0.28.0")
19+
bazel_dep(name = "eigen", version = "4.0.0-20241125.bcr.1")
20+
bazel_dep(name = "fuzztest", version = "20250214.0", repo_name = "com_google_fuzztest")
21+
bazel_dep(name = "gazelle", version = "0.42.0", repo_name = "bazel_gazelle")
22+
bazel_dep(name = "glpk", version = "5.0.bcr.3")
23+
bazel_dep(name = "google_benchmark", version = "1.9.1", repo_name = "com_google_benchmark")
24+
bazel_dep(name = "googletest", version = "1.16.0", repo_name = "com_google_googletest")
2625
bazel_dep(name = "highs", version = "1.9.0")
27-
bazel_dep(name = "platforms", version = "0.0.10")
26+
bazel_dep(name = "platforms", version = "0.0.11")
2827
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf")
2928
bazel_dep(name = "pybind11_abseil", version = "202402.0")
3029
bazel_dep(name = "pybind11_bazel", version = "2.13.6")
3130
bazel_dep(name = "pybind11_protobuf", version = "0.0.0-20240524-1d7a729")
32-
bazel_dep(name = "re2", version = "2024-07-02", repo_name = "com_google_re2")
31+
bazel_dep(name = "re2", version = "2024-07-02.bcr.1", repo_name = "com_google_re2")
3332
bazel_dep(name = "rules_cc", version = "0.1.1")
34-
bazel_dep(name = "rules_go", version = "0.50.1", repo_name = "io_bazel_rules_go")
35-
bazel_dep(name = "rules_java", version = "8.6.3")
36-
bazel_dep(name = "rules_jvm_external", version = "6.6")
33+
bazel_dep(name = "rules_go", version = "0.53.0", repo_name = "io_bazel_rules_go")
34+
bazel_dep(name = "rules_java", version = "8.9.0")
35+
bazel_dep(name = "rules_jvm_external", version = "6.7")
3736
bazel_dep(name = "rules_license", version = "1.0.0")
3837
bazel_dep(name = "rules_proto", version = "7.1.0")
39-
bazel_dep(name = "rules_python", version = "1.0.0")
38+
bazel_dep(name = "rules_python", version = "1.2.0")
4039
bazel_dep(name = "scip", version = "9.2.1")
4140
bazel_dep(name = "swig", version = "4.3.0")
42-
bazel_dep(name = "zlib", version = "1.3.1.bcr.4")
41+
bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
4342

4443
git_override(
4544
module_name = "pybind11_abseil",

‎cmake/dependencies/CMakeLists.txt

+8-3
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,21 @@ endif()
7878
if(BUILD_absl)
7979
message(CHECK_START "Fetching Abseil-cpp")
8080
list(APPEND CMAKE_MESSAGE_INDENT " ")
81-
set(ABSL_ENABLE_INSTALL ON)
8281
set(ABSL_USE_SYSTEM_INCLUDES ON)
82+
# We want Abseil to declare what C++ standard it was compiled with.
8383
set(ABSL_PROPAGATE_CXX_STD ON)
84+
# We want Abseil to keep the INSTALL rules enabled, even though it is a
85+
# subproject. Otherwise the install rules in this project break.
86+
set(ABSL_ENABLE_INSTALL ON)
8487
set(ABSL_BUILD_TESTING OFF)
8588
FetchContent_Declare(
8689
absl
8790
GIT_REPOSITORY "https://github.com/abseil/abseil-cpp.git"
88-
GIT_TAG "20240722.0"
91+
GIT_TAG "20250127.0"
8992
GIT_SHALLOW TRUE
90-
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/abseil-cpp-20240722.0.patch"
93+
PATCH_COMMAND git apply --ignore-whitespace
94+
"${CMAKE_CURRENT_LIST_DIR}/../../patches/abseil-cpp-20250127.0.patch"
95+
OVERRIDE_FIND_PACKAGE
9196
)
9297
FetchContent_MakeAvailable(absl)
9398
list(POP_BACK CMAKE_MESSAGE_INDENT)

‎cmake/host.CMakeLists.txt

+8-3
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,14 @@ list(APPEND CMAKE_MESSAGE_INDENT " ")
102102
set(ABSL_ENABLE_INSTALL ON)
103103
set(ABSL_USE_SYSTEM_INCLUDES ON)
104104
set(ABSL_PROPAGATE_CXX_STD ON)
105+
set(ABSL_BUILD_TESTING OFF)
105106
FetchContent_Declare(
106107
absl
107108
GIT_REPOSITORY "https://github.com/abseil/abseil-cpp.git"
108-
GIT_TAG "20240722.0"
109-
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/abseil-cpp-20240722.0.patch")
109+
GIT_TAG "20250127.0"
110+
GIT_SHALLOW TRUE
111+
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/abseil-cpp-20250127.0.patch"
112+
)
110113
FetchContent_MakeAvailable(absl)
111114
list(POP_BACK CMAKE_MESSAGE_INDENT)
112115
message(CHECK_PASS "fetched")
@@ -122,8 +125,10 @@ FetchContent_Declare(
122125
protobuf
123126
GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
124127
GIT_TAG "v29.3"
128+
GIT_SHALLOW TRUE
125129
GIT_SUBMODULES ""
126-
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v29.3.patch")
130+
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v29.3.patch"
131+
)
127132
FetchContent_MakeAvailable(protobuf)
128133
list(POP_BACK CMAKE_MESSAGE_INDENT)
129134
message(CHECK_PASS "fetched")

‎cmake/java.cmake

+2
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,7 @@ add_custom_command(
365365
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_format>>
366366
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_globals>>
367367
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_log_sink_set>>
368+
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_structured_proto>>
368369
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_message>>
369370
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_nullguard>>
370371
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_proto>>
@@ -397,6 +398,7 @@ add_custom_command(
397398
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::synchronization>>
398399
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::throw_delegate>>
399400
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::time>>
401+
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::tracing_internal>>
400402
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::time_zone>>
401403
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::utf8_for_code_point>>
402404
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::vlog_config_internal>>

‎cmake/python.cmake

+2
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,7 @@ add_custom_command(
521521
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_format>>
522522
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_globals>>
523523
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_log_sink_set>>
524+
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_structured_proto>>
524525
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_message>>
525526
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_nullguard>>
526527
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::log_internal_proto>>
@@ -554,6 +555,7 @@ add_custom_command(
554555
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::throw_delegate>>
555556
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::time>>
556557
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::time_zone>>
558+
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::tracing_internal>>
557559
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::utf8_for_code_point>>
558560
$<${need_unix_absl_lib}:$<TARGET_SONAME_FILE:absl::vlog_config_internal>>
559561
$<${need_windows_absl_lib}:$<TARGET_FILE:absl::abseil_dll>>

‎ortools/dotnet/Google.OrTools.runtime.csproj.in

+2
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_format>>
7979
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_globals>>
8080
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_log_sink_set>>
81+
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_structured_proto>>
8182
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_message>>
8283
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_nullguard>>
8384
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::log_internal_proto>>
@@ -111,6 +112,7 @@
111112
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::throw_delegate>>
112113
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::time>>
113114
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::time_zone>>
115+
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::tracing_internal>>
114116
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::utf8_for_code_point>>
115117
$<@need_unix_absl_lib@:;$<TARGET_SONAME_FILE:absl::vlog_config_internal>>
116118
$<@need_windows_absl_lib@:;$<TARGET_FILE:absl::abseil_dll>>

‎patches/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# limitations under the License.
1313

1414
exports_files([
15-
"abseil-cpp-20240722.0.patch",
15+
"abseil-cpp-20250127.0.patch",
1616
"highs-v1.9.0.patch",
1717
"protobuf-v29.3.patch",
1818
"pybind11_abseil.patch",

‎patches/abseil-cpp-20240722.0.patch ‎patches/abseil-cpp-20250127.0.patch

File renamed without changes.

0 commit comments

Comments
 (0)