From a293de488dbbdbba0ebfe7e03c1728dddf272b50 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 25 Feb 2026 18:49:18 -0800 Subject: [PATCH] undo the awful GEOS -include flag hack --- .gitmodules | 3 ++- Makefile | 2 +- c-deps/geos | 2 +- c-deps/geos-rebuild | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index b244c9e749..13650d47e8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,8 @@ url = https://github.com/cockroachdb/jemalloc.git [submodule "c-deps/geos"] path = c-deps/geos - url = https://github.com/cockroachdb/geos.git + url = https://github.com/oxidecomputer/geos.git + branch = 3.8.1-cockroach [submodule "c-deps/proj"] path = c-deps/proj url = https://github.com/oxidecomputer/PROJ.git diff --git a/Makefile b/Makefile index 599d00a424..f8700aa500 100644 --- a/Makefile +++ b/Makefile @@ -558,7 +558,7 @@ $(GEOS_DIR)/Makefile: $(C_DEPS_DIR)/geos-rebuild | bin/.submodules-initialized @# NOTE: If you change the CMake flags below, bump the version in @# $(C_DEPS_DIR)/geos-rebuild. See above for rationale. cd $(GEOS_DIR) && \ - cmake $(xcmake-flags) $(GEOS_SRC_DIR) -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS="-fPIC -include cstddef -include cstdint" + cmake $(xcmake-flags) $(GEOS_SRC_DIR) -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC @# Copy geos/export.h to the capi include directory to avoid needing multiple include @# directories. mkdir $(GEOS_DIR)/capi/geos diff --git a/c-deps/geos b/c-deps/geos index ac79ef98b6..8bfb91ff2c 160000 --- a/c-deps/geos +++ b/c-deps/geos @@ -1 +1 @@ -Subproject commit ac79ef98b6a7bd26c87bf069f1e0685dbb648ba2 +Subproject commit 8bfb91ff2cfee16b29316894fd65d0f2a8a09607 diff --git a/c-deps/geos-rebuild b/c-deps/geos-rebuild index 7a2ca6531e..e8c994c48f 100644 --- a/c-deps/geos-rebuild +++ b/c-deps/geos-rebuild @@ -1,4 +1,4 @@ Bump the version below when changing geos configure flags. Search for "BUILD ARTIFACT CACHING" in build/common.mk for rationale. -9 +10