Update C++ dependencies, roughly matching ones used on python. (#116)

deephaven · May 9, 2024 · e912273 · e912273
1 parent e2f0889
commit e912273
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/cpp-client/build-dependencies.sh b/cpp-client/build-dependencies.sh
@@ -490,8 +490,8 @@ if [ "$CLONE_ABSEIL" = "yes" ]; then
   echo
   echo "*** Clone abseil"
   cd $SRC
-  # Previously used version: 20210324.2
-  git clone $GIT_FLAGS -b 20211102.0 --depth 1 "${GITHUB_BASE_URL}/abseil/abseil-cpp.git"
+  # Previously used version: 20211102.0
+  git clone $GIT_FLAGS -b 20240116.0 --depth 1 "${GITHUB_BASE_URL}/abseil/abseil-cpp.git"
   echo "*** Cloning abseil DONE"
   if [ "$fedora38" = "yes" ]; then
   echo "*** Patching abseil for Fedora 38"
@@ -530,8 +530,8 @@ if [ "$CLONE_ZLIB" = "yes" ]; then
   echo
   echo "*** Clone zlib"
   cd $SRC
-  # Previously used version: v1.2.11
-  git clone $GIT_FLAGS -b v1.2.13 --depth 1 "${GITHUB_BASE_URL}/madler/zlib"
+  # Previously used version: v1.2.13
+  git clone $GIT_FLAGS -b v1.3 --depth 1 "${GITHUB_BASE_URL}/madler/zlib"
   echo "*** Cloning zlib DONE"
 fi
 if [ "$BUILD_ZLIB" = "yes" ]; then
@@ -561,24 +561,25 @@ if [ "$CLONE_PROTOBUF" = "yes" ]; then
   echo
   echo "*** Cloning protobuf"
   cd $SRC
-  # Previously used version: v3.21.12
-  git clone $GIT_FLAGS -b v3.21.2 --depth 1 "${GITHUB_BASE_URL}/protocolbuffers/protobuf.git"
+  # Previously used version: v3.21.2
+  git clone $GIT_FLAGS -b v26.1 --depth 1 "${GITHUB_BASE_URL}/protocolbuffers/protobuf.git"
   echo "*** Cloning protobuf DONE"
 fi
 if [ "$BUILD_PROTOBUF" = "yes" ]; then
   echo
   echo "*** Building protobuf"
   cd $SRC/protobuf
   # Note in the previously used version we built inside cmake/build; not anymore.
-  mkdir -p "cmake/$BUILD_DIR" && cd "cmake/$BUILD_DIR"
+  mkdir -p "$BUILD_DIR" && cd "$BUILD_DIR"
   cmake -Dprotobuf_BUILD_TESTS=OFF \
         ${cmake_common_args} \
         -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
+        -Dprotobuf_ABSL_PROVIDER=package \
         -DCMAKE_INSTALL_PREFIX=$(prefix protobuf) \
         ..
   make -j$NCPUS
   make install
-  cd ../.. && rm -fr "cmake/$BUILD_DIR"
+  cd .. && rm -fr "$BUILD_DIR"
   if [ "$clean" = "yes" ]; then
     rm -fr "$SRC/protobuf"
   fi
@@ -689,7 +690,7 @@ if [ "$CLONE_CARES" = "yes" ]; then
   echo "*** Clone ares"
   cd $SRC
   # Previously used version: cares-1_18_1
-  git clone $GIT_FLAGS -b cares-1_18_1 --depth 1 "${GITHUB_BASE_URL}/c-ares/c-ares.git"
+  git clone $GIT_FLAGS -b cares-1_28_1 --depth 1 "${GITHUB_BASE_URL}/c-ares/c-ares.git"
   echo "*** Cloning ares DONE"
 fi
 if [ "$BUILD_CARES" = "yes" ]; then
@@ -721,8 +722,8 @@ if [ "$CLONE_GRPC" = "yes" ]; then
   echo
   echo "*** Clone grpc"
   cd $SRC
-  # Previously used version: v1.45.2
-  git clone $GIT_FLAGS -b v1.46.7 --depth 1 "${GITHUB_BASE_URL}/grpc/grpc"
+  # Previously used version: v1.46.7
+  git clone $GIT_FLAGS -b v1.63.0 --depth 1 "${GITHUB_BASE_URL}/grpc/grpc"
   echo "*** Cloning grpc DONE"
 fi
 if [ "$BUILD_GRPC" = "yes" ]; then
@@ -756,8 +757,8 @@ if [ "$CLONE_ARROW" = "yes" ]; then
   echo
   echo "*** Cloning arrow"
   cd $SRC
-  # Previously used version: apache-arrow-7.0.0
-  git clone $GIT_FLAGS -b apache-arrow-13.0.0 --depth 1 "${GITHUB_BASE_URL}/apache/arrow"
+  # Previously used version: apache-arrow-13.0.0
+  git clone $GIT_FLAGS -b apache-arrow-16.0.0 --depth 1 "${GITHUB_BASE_URL}/apache/arrow"
   echo "*** Cloning arrow DONE"
 fi
 if [ "$BUILD_ARROW" = "yes" ]; then