Skip to content

undo the awful GEOS -include flag hack #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iliana merged 1 commit into from
Feb 26, 2026
Merged

undo the awful GEOS -include flag hack #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion c-deps/geos
Open in desktop
Submodule geos updated 2 files
+1 −0 include/geos/geomgraph/TopologyLocation.h
+1 −0 include/geos/io/WKBWriter.h
2 changes: 1 addition & 1 deletion c-deps/geos-rebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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