From b7d9ea781c4050bb21ecb2529c6df5a39e3c65bb Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Fri, 1 Nov 2024 13:05:37 -0700 Subject: [PATCH] fix #3: get GEOS building on modern compilers (#16) --- Makefile | 2 +- c-deps/geos-rebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 49a12f33bbb..c66e7d6db81 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 + cmake $(xcmake-flags) $(GEOS_SRC_DIR) -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS="-fPIC -include cstddef -include cstdint" @# 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-rebuild b/c-deps/geos-rebuild index f34a5a81a92..7a2ca6531ee 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. -8 +9