add latest duckdb changes

marcboeker · Sep 20, 2024 · b802aae · b802aae
1 parent f4ae3d0
commit b802aae
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 59 deletions.
diff --git a/.github/workflows/deps.yaml b/.github/workflows/deps.yaml
@@ -8,7 +8,6 @@ on:
     paths:
       - ".github/workflows/**"
       - "Makefile"
-      - "*.patch"
 jobs:
   prepare:
     runs-on: ubuntu-20.04

diff --git a/0001-Add-static-flag-to-duckdb.patch b/0001-Add-static-flag-to-duckdb.patch
diff --git a/Makefile b/Makefile
@@ -16,8 +16,6 @@ test:
 .PHONY: deps.header
 deps.header:
 	git clone -b ${DUCKDB_BRANCH} --depth 1 ${DUCKDB_REPO}
-
-	cd duckdb && git apply --verbose ../0001-Add-static-flag-to-duckdb.patch
 	cp duckdb/src/include/duckdb.h duckdb.h
 
 .PHONY: duckdb

diff --git a/cgo_static.go b/cgo_static.go
@@ -3,7 +3,7 @@
 package duckdb
 
 /*
-#cgo CPPFLAGS: -DDUCKDB_STATIC
+#cgo CPPFLAGS: -DDUCKDB_STATIC_BUILD
 #cgo LDFLAGS: -lduckdb
 #cgo darwin,amd64 LDFLAGS: -lc++ -L${SRCDIR}/deps/darwin_amd64
 #cgo darwin,arm64 LDFLAGS: -lc++ -L${SRCDIR}/deps/darwin_arm64