From dcd7218db8de3b5798ab1a67ba947e2d180406c4 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Fri, 1 Nov 2024 16:22:42 +0000 Subject: [PATCH 1/2] fix #3: get GEOS building on modern compilers --- Makefile | 2 +- c-deps/geos-rebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 49a12f33bbb..dc089726c23 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 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 From b1dfb4c07e7aaf19272fff05c03416c66bbac1e8 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Fri, 1 Nov 2024 17:59:02 +0000 Subject: [PATCH 2/2] also fix builds on macOS 14 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dc089726c23..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 -include cstdint" + 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