From 9a86cd0d4f480cbfe043abe62af700effb57b541 Mon Sep 17 00:00:00 2001
From: BodoBolero <peterbendel@neon.tech>
Date: Fri, 21 Feb 2025 11:50:36 +0100
Subject: [PATCH] link all duckdb static libs into pg_duckdb.so

---
 compute/patches/pg_duckdb_v031.patch | 6 +++---
 vendor/postgres-v15                  | 2 +-
 vendor/postgres-v16                  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compute/patches/pg_duckdb_v031.patch b/compute/patches/pg_duckdb_v031.patch
index bd1b35acfa..9b752c46f3 100644
--- a/compute/patches/pg_duckdb_v031.patch
+++ b/compute/patches/pg_duckdb_v031.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index 3235cc8..ca401da 100644
+index 3235cc8..e232052 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -32,7 +32,16 @@ else
@@ -8,10 +8,10 @@ index 3235cc8..ca401da 100644
  
 -DUCKDB_LIB = libduckdb$(DLSUFFIX)
 +DUCKDB_STATIC ?= 0
-+PG_DUCKDB_LINK_FLAGS = -Wl,-rpath,$(PG_LIB)/ -lpq -Lthird_party/duckdb/build/$(DUCKDB_BUILD_TYPE)/src -L$(PG_LIB) -lstdc++ -llz4
++PG_DUCKDB_LINK_FLAGS = -Wl,-rpath,$(PG_LIB)/ -lpq -Lthird_party/duckdb/build/$(DUCKDB_BUILD_TYPE)/src -Lthird_party/duckdb/build/$(DUCKDB_BUILD_TYPE)/extension/json -Lthird_party/duckdb/build/$(DUCKDB_BUILD_TYPE)/extension/parquet -Lthird_party/duckdb/build/$(DUCKDB_BUILD_TYPE)/extension/core_functions -Lthird_party/duckdb/build/$(DUCKDB_BUILD_TYPE)/extension/jemalloc -Lthird_party/duckdb/build/$(DUCKDB_BUILD_TYPE)/extension/icu -Lthird_party/duckdb/build/$(DUCKDB_BUILD_TYPE)/extension/cached_httpfs -Lthird_party/duckdb/build/$(DUCKDB_BUILD_TYPE)/third_party/yyjson -Lthird_party/duckdb/build/$(DUCKDB_BUILD_TYPE)/third_party/miniz -Lthird_party/duckdb/build/$(DUCKDB_BUILD_TYPE)/third_party/zstd -Lthird_party/duckdb/build/$(DUCKDB_BUILD_TYPE)/third_party/skiplist -Lthird_party/duckdb/build/$(DUCKDB_BUILD_TYPE)/third_party/mbedtls -Lthird_party/duckdb/build/$(DUCKDB_BUILD_TYPE)/third_party/utf8proc -Lthird_party/duckdb/build/$(DUCKDB_BUILD_TYPE)/third_party/hyperloglog -Lthird_party/duckdb/build/$(DUCKDB_BUILD_TYPE)/third_party/fastpforlib -Lthird_party/duckdb/build/$(DUCKDB_BUILD_TYPE)/third_party/re2 -Lthird_party/duckdb/build/$(DUCKDB_BUILD_TYPE)/third_party/libpg_query -Lthird_party/duckdb/build/$(DUCKDB_BUILD_TYPE)/third_party/fsst -Lthird_party/duckdb/build/$(DUCKDB_BUILD_TYPE)/third_party/fmt -L$(PG_LIB) -lstdc++ -llz4
 +ifeq ($(DUCKDB_STATIC), 1)
 +	DUCKDB_LIB = libduckdb_static.a
-+	PG_DUCKDB_LINK_FLAGS += -l:$(DUCKDB_LIB)
++	PG_DUCKDB_LINK_FLAGS += -l:$(DUCKDB_LIB) -l:libjson_extension.a -l:libparquet_extension.a -l:libcore_functions_extension.a -l:libjemalloc_extension.a -l:libicu_extension.a -l:libcached_httpfs_extension.a -l:libduckdb_yyjson.a -l:libduckdb_miniz.a -l:libduckdb_zstd.a -l:libduckdb_skiplistlib.a -l:libduckdb_mbedtls.a -l:libduckdb_utf8proc.a -l:libduckdb_hyperloglog.a -l:libduckdb_fastpforlib.a -l:libduckdb_re2.a -l:libduckdb_pg_query.a -l:libduckdb_fsst.a -l:libduckdb_fmt.a
 +else
 +	DUCKDB_LIB = libduckdb$(DLSUFFIX)
 +	PG_DUCKDB_LINK_FLAGS += -lduckdb
diff --git a/vendor/postgres-v15 b/vendor/postgres-v15
index 6ff5044377..023f1020ec 160000
--- a/vendor/postgres-v15
+++ b/vendor/postgres-v15
@@ -1 +1 @@
-Subproject commit 6ff50443773b69749e16da6db9d4f4b19064b4b7
+Subproject commit 023f1020ecb07af3bb0ddbf4622e1a3c3fa276a4
diff --git a/vendor/postgres-v16 b/vendor/postgres-v16
index 261ed10e9b..6cb8d22079 160000
--- a/vendor/postgres-v16
+++ b/vendor/postgres-v16
@@ -1 +1 @@
-Subproject commit 261ed10e9b8c8dda01ad7aefb18e944e30aa161d
+Subproject commit 6cb8d22079570b50fcaff29124d40807c1e63a82