bundle regexp to the libsql-ffi

Author: sivukhin

libsql-ffi/Cargo.toml

@@ -40,13 +40,15 @@ sqlean-extension-fuzzy = []
 sqlean-extension-math = []
 sqlean-extension-stats = []
 sqlean-extension-text = []
+sqlean-extension-regexp = []
 sqlean-extensions = [
   "sqlean-extension-uuid",
   "sqlean-extension-crypto",
   "sqlean-extension-fuzzy",
   "sqlean-extension-math",
   "sqlean-extension-stats",
   "sqlean-extension-text",
+  "sqlean-extension-regexp",
 ]
 libsql-disable-checkpoint-downgrade = []
 libsql-checkpoint-only-full= []

libsql-ffi/build.rs

@@ -252,6 +252,11 @@ pub fn build_bundled(out_dir: &str, out_path: &Path) {
         sqlean_patterns.push("uuid/*.c");
     }
 
+    if cfg!(feature = "sqlean-extension-regexp") {
+        enabled_extensions.push("regexp");
+        sqlean_patterns.push("regexp/*.c");
+    }
+
     if sqlean_patterns.is_empty() {
         cfg.file(format!("{BUNDLED_DIR}/src/sqlite3.c"));
     } else {

libsql-ffi/bundled/bindings/bindgen.rs

@@ -23,7 +23,6 @@ extern "C" {
     ) -> ::std::os::raw::c_int;
 }
 
-pub const __GNUC_VA_LIST: i32 = 1;
 pub const SQLITE_VERSION: &[u8; 7] = b"3.45.1\0";
 pub const SQLITE_VERSION_NUMBER: i32 = 3045001;
 pub const SQLITE_SOURCE_ID: &[u8; 85] =
@@ -502,8 +501,8 @@ pub const FTS5_TOKENIZE_DOCUMENT: i32 = 4;
 pub const FTS5_TOKENIZE_AUX: i32 = 8;
 pub const FTS5_TOKEN_COLOCATED: i32 = 1;
 pub const WAL_SAVEPOINT_NDATA: i32 = 4;
-pub type va_list = __builtin_va_list;
-pub type __gnuc_va_list = __builtin_va_list;
+pub type __gnuc_va_list = [u64; 4usize];
+pub type va_list = [u64; 4usize];
 extern "C" {
     pub static sqlite3_version: [::std::os::raw::c_char; 0usize];
 }
@@ -940,7 +939,7 @@ extern "C" {
 extern "C" {
     pub fn sqlite3_vmprintf(
         arg1: *const ::std::os::raw::c_char,
-        arg2: *mut __va_list_tag,
+        arg2: va_list,
     ) -> *mut ::std::os::raw::c_char;
 }
 extern "C" {
@@ -956,7 +955,7 @@ extern "C" {
         arg1: ::std::os::raw::c_int,
         arg2: *mut ::std::os::raw::c_char,
         arg3: *const ::std::os::raw::c_char,
-        arg4: *mut __va_list_tag,
+        arg4: va_list,
     ) -> *mut ::std::os::raw::c_char;
 }
 extern "C" {
@@ -2506,7 +2505,7 @@ extern "C" {
     pub fn sqlite3_str_vappendf(
         arg1: *mut sqlite3_str,
         zFormat: *const ::std::os::raw::c_char,
-        arg2: *mut __va_list_tag,
+        arg2: va_list,
     );
 }
 extern "C" {
@@ -3574,12 +3573,3 @@ extern "C" {
 extern "C" {
     pub static sqlite3_wal_manager: libsql_wal_manager;
 }
-pub type __builtin_va_list = [__va_list_tag; 1usize];
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct __va_list_tag {
-    pub gp_offset: ::std::os::raw::c_uint,
-    pub fp_offset: ::std::os::raw::c_uint,
-    pub overflow_arg_area: *mut ::std::os::raw::c_void,
-    pub reg_save_area: *mut ::std::os::raw::c_void,
-}

libsql-sys/Cargo.toml

@@ -31,4 +31,5 @@ sqlean-extension-fuzzy = ["libsql-ffi/sqlean-extension-fuzzy"]
 sqlean-extension-math = ["libsql-ffi/sqlean-extension-math"]
 sqlean-extension-stats = ["libsql-ffi/sqlean-extension-stats"]
 sqlean-extension-text = ["libsql-ffi/sqlean-extension-text"]
+sqlean-extension-regexp = ["libsql-ffi/sqlean-extension-regexp"]
 sqlean-extensions = ["libsql-ffi/sqlean-extensions"]