fix jamfile build

Mozilla-Ocho · Dec 20, 2024 · a09bdcf · a09bdcf
1 parent fd370f4
commit a09bdcf
Show file tree

Hide file tree

Showing 8 changed files with 10,798 additions and 7 deletions.
diff --git a/jamfile/BUILD.mk b/jamfile/BUILD.mk
@@ -92,10 +92,8 @@ o/$(MODE)/jamfile/jamfile:					\
 		o/$(MODE)/third_party/sqlite/sqlite3.a \
 		o/$(MODE)/jamfile/quickjs-sqlite.a \
 		o/$(MODE)/jamfile/quickjs-llamafile.a \
-		o/$(MODE)/embedfile/sqlite-csv.a \
-		o/$(MODE)/embedfile/sqlite-vec.a \
-		o/$(MODE)/embedfile/sqlite-lines.a \
-		o/$(MODE)/embedfile/sqlite-lembed.a
+		o/$(MODE)/third_party/sqlite/sqlite-csv.a	\
+		o/$(MODE)/third_party/sqlite/sqlite-vec.a	
 
 $(LLAMA_CPP_JAMFILE_OBJS): private CCFLAGS += -DSQLITE_CORE
 

diff --git a/jamfile/quickjs-sqlite.c b/jamfile/quickjs-sqlite.c
@@ -1,8 +1,8 @@
 #include "third_party/sqlite/sqlite3.h"
 #include "third_party/quickjs/quickjs.h"
 #include "third_party/quickjs/cutils.h"
-#include "embedfile/sqlite-vec.h"
-#include "embedfile/sqlite-csv.h"
+#include "third_party/sqlite/sqlite-vec.h"
+#include "third_party/sqlite/sqlite-csv.h"
 #include <assert.h>
 
 

diff --git a/third_party/sqlite/BUILD.mk b/third_party/sqlite/BUILD.mk
@@ -13,6 +13,12 @@ THIRD_PARTY_SQLITE_HDRS =					\
 o/$(MODE)/third_party/sqlite/sqlite3.a:				\
 		o/$(MODE)/third_party/sqlite/sqlite3.o		\
 
+o/$(MODE)/third_party/sqlite/sqlite-csv.a:		\
+		o/$(MODE)/third_party/sqlite/sqlite-csv.o	\
+
+o/$(MODE)/third_party/sqlite/sqlite-vec.a:		\
+		o/$(MODE)/third_party/sqlite/sqlite-vec.o	\
+
 o/$(MODE)/third_party/sqlite/shell:				\
 		o/$(MODE)/third_party/sqlite/shell.o		\
 		o/$(MODE)/third_party/sqlite/sqlite3.o		\
@@ -61,3 +67,5 @@ o/$(MODE)/third_party/sqlite/sqlite3.o:				\
 o/$(MODE)/third_party/sqlite:					\
 		o/$(MODE)/third_party/sqlite/shell		\
 		o/$(MODE)/third_party/sqlite/sqlite3.a		\
+		o/$(MODE)/third_party/sqlite/sqlite-csv.a		\
+		o/$(MODE)/third_party/sqlite/sqlite-vec.a		\
diff --git a/third_party/sqlite/README.llamafile b/third_party/sqlite/README.llamafile
@@ -1,11 +1,15 @@
 DESCRIPTION
 
-  SQLite is the world's most popular database
+  SQLite is the world's most popular database, along with other community SQLite extensions.
 
 ORIGIN
 
   https://www.sqlite.org/2024/sqlite-amalgamation-3470100.zip
 
+  https://sqlite.org/src/file/ext/misc/csv.c
+
+  https://github.com/asg017/sqlite-vec
+
 LICENSE
 
   Public domain or MIT
@@ -14,3 +18,4 @@ LOCAL CHANGES
 
   - Renamed <zlib.h> to <third_party/zlib/zlib.h>
   - Mangled some quoted includes to not confuse mkdeps
+  - For sqlite-csv: Eemoved dynamic linking code in favor of static linking