From 5fcc2df89290e05a15440e5c3d7235dcf6ee6a0d Mon Sep 17 00:00:00 2001
From: Kevin Wilfong <kevinwilfong@fb.com>
Date: Mon, 7 Jul 2025 14:04:02 -0700
Subject: [PATCH] Advance velox

---
 .github/workflows/linux-build.yml |  6 ++++--
 CMake/abseil.cmake                | 22 ----------------------
 CMake/absl.cmake                  | 25 +++++++++++++++++++++++++
 CMakeLists.txt                    |  4 ++--
 velox                             |  2 +-
 5 files changed, 32 insertions(+), 27 deletions(-)
 delete mode 100644 CMake/abseil.cmake
 create mode 100644 CMake/absl.cmake

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index 70f1f91a..d215c035 100644
--- a/.github/workflows/linux-build.yml
+++ b/.github/workflows/linux-build.yml
@@ -1,4 +1,4 @@
-# Copyright (c) Meta Platforms, Inc. and its affiliates.
+# Copyright (c) Meta Platforms, Inc. and affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -69,7 +69,9 @@ jobs:
             libsnappy-dev \
             bison \
             flex \
-            libfl-dev
+            libfl-dev \
+            libgeos++-dev
+       
 
       - name: "Build"
         env:
diff --git a/CMake/abseil.cmake b/CMake/abseil.cmake
deleted file mode 100644
index 4b3a4fbc..00000000
--- a/CMake/abseil.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-include_guard(GLOBAL)
-
-# TODO: these variables are named VELOX_* because we are piggy-backing on
-# Velox's resolve dependency module for now. We should change and have our own
-# in the future.
-set(VELOX_ABSEIL_VERSION 20240116.0)
-set(VELOX_ABSEIL_BUILD_SHA256_CHECKSUM
-    "338420448b140f0dfd1a1ea3c3ce71b3bc172071f24f4d9a57d59b45037da440")
-set(VELOX_ABSEIL_SOURCE_URL
-    "https://github.com/abseil/abseil-cpp/archive/refs/tags/${VELOX_ABSEIL_VERSION}.tar.gz"
-)
-
-velox_resolve_dependency_url(ABSEIL)
-
-message(STATUS "Building abseil from source")
-
-FetchContent_Declare(
-  abseil
-  URL ${VELOX_ABSEIL_SOURCE_URL}
-  URL_HASH ${VELOX_ABSEIL_BUILD_SHA256_CHECKSUM})
-
-FetchContent_MakeAvailable(abseil)
diff --git a/CMake/absl.cmake b/CMake/absl.cmake
new file mode 100644
index 00000000..948358d0
--- /dev/null
+++ b/CMake/absl.cmake
@@ -0,0 +1,25 @@
+include_guard(GLOBAL)
+
+# TODO: these variables are named VELOX_* because we are piggy-backing on
+# Velox's resolve dependency module for now. We should change and have our own
+# in the future.
+set(VELOX_ABSL_VERSION 20240116.0)
+set(VELOX_ABSL_BUILD_SHA256_CHECKSUM
+    "338420448b140f0dfd1a1ea3c3ce71b3bc172071f24f4d9a57d59b45037da440")
+set(VELOX_ABSL_SOURCE_URL
+    "https://github.com/abseil/abseil-cpp/archive/refs/tags/${VELOX_ABSL_VERSION}.tar.gz"
+)
+
+velox_resolve_dependency_url(ABSL)
+
+message(STATUS "Building Abseil from source")
+
+FetchContent_Declare(
+  absl
+  URL ${VELOX_ABSL_SOURCE_URL}
+  URL_HASH ${VELOX_ABSL_BUILD_SHA256_CHECKSUM})
+
+set(ABSL_BUILD_TESTING OFF)
+set(ABSL_PROPAGATE_CXX_STD ON)
+set(ABSL_ENABLE_INSTALL ON)
+FetchContent_MakeAvailable(absl)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9ecb68a..030a4d21 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -115,8 +115,8 @@ velox_resolve_dependency(Boost 1.77.0 COMPONENTS ${BOOST_INCLUDE_LIBRARIES})
 velox_set_source(folly)
 velox_resolve_dependency(folly)
 
-velox_set_source(abseil)
-velox_resolve_dependency(abseil)
+velox_set_source(absl)
+velox_resolve_dependency(absl)
 
 # Use xxhash and xsimd from Velox for now.
 include_directories(.)
diff --git a/velox b/velox
index c724a40e..ed764fbf 160000
--- a/velox
+++ b/velox
@@ -1 +1 @@
-Subproject commit c724a40e7a743edb7095aef8ce026bb7416b1d20
+Subproject commit ed764fbff248c96e8fe3b58e9b14fb40ffefa8c7