From 21df8c7e05842948c6e00c69f88a5a571b450e46 Mon Sep 17 00:00:00 2001 From: Carlo Piovesan Date: Tue, 10 Sep 2024 11:51:55 +0200 Subject: [PATCH 1/2] Remove unnecessary variables, shadowing actual LINKED_LIBS variable --- Makefile | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Makefile b/Makefile index 056874b9..830e5a45 100644 --- a/Makefile +++ b/Makefile @@ -79,17 +79,6 @@ CLIENT_FLAGS:= # For regular CLI build, we link the spatial extension directly into the DuckDB executable CLIENT_FLAGS=-DDUCKDB_EXTENSION_${EXTENSION_NAME}_SHOULD_LINK=1 - -# These flags will make DuckDB build the extension -EXTENSION_FLAGS=\ --DENABLE_SANITIZER=OFF \ --DDUCKDB_EXTENSION_NAMES="spatial" \ --DDUCKDB_EXTENSION_SPATIAL_PATH="$(PROJ_DIR)" \ --DDUCKDB_EXTENSION_SPATIAL_SHOULD_LINK=1 \ --DDUCKDB_EXTENSION_SPATIAL_LOAD_TESTS=1 \ --DDUCKDB_EXTENSION_SPATIAL_TEST_PATH="$(PROJ_DIR)test" \ --DDUCKDB_EXTENSION_SPATIAL_INCLUDE_PATH="$(PROJ_DIR)spatial/include" \ - debug: mkdir -p build/debug && \ cmake $(GENERATOR) $(BUILD_FLAGS) $(CLIENT_FLAGS) -DCMAKE_BUILD_TYPE=Debug -S ./duckdb/ -B build/debug && \ From 5720575fafe6b10748a8d2172a72eb93182f59f6 Mon Sep 17 00:00:00 2001 From: Carlo Piovesan Date: Tue, 10 Sep 2024 11:54:15 +0200 Subject: [PATCH 2/2] Bump to DuckDB v1.1.0 --- duckdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/duckdb b/duckdb index 06e9a0b9..fa5c2fe1 160000 --- a/duckdb +++ b/duckdb @@ -1 +1 @@ -Subproject commit 06e9a0b93cfc782b45289472988206e1f33296d6 +Subproject commit fa5c2fe15f3da5f32397b009196c0895fce60820