Merge branch 'tursodatabase:main' into main

Author: kunjee17

Cargo.lock

@@ -25,18 +25,18 @@ exclude = [
 ]
 
 [workspace.package]
-version = "0.9.2"
+version = "0.9.4"
 authors = ["the libSQL authors"]
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/tursodatabase/libsql"
 
 [workspace.dependencies]
-libsql-ffi = { path = "libsql-ffi", version = "0.9.2" }
-libsql-sys = { path = "libsql-sys", version = "0.9.2", default-features = false }
-libsql-hrana = { path = "libsql-hrana", version = "0.9.2" }
-libsql_replication = { path = "libsql-replication", version = "0.9.2" }
-rusqlite = { package = "libsql-rusqlite", path = "vendored/rusqlite", version = "0.9.2", default-features = false, features = [
+libsql-ffi = { path = "libsql-ffi", version = "0.9.4" }
+libsql-sys = { path = "libsql-sys", version = "0.9.4", default-features = false }
+libsql-hrana = { path = "libsql-hrana", version = "0.9.4" }
+libsql_replication = { path = "libsql-replication", version = "0.9.4" }
+rusqlite = { package = "libsql-rusqlite", path = "vendored/rusqlite", version = "0.9.4", default-features = false, features = [
     "libsql-experimental",
     "column_decltype",
     "load_extension",

Cargo.toml

@@ -76,22 +76,20 @@ fn copy_dir_all(src: impl AsRef<Path>, dst: impl AsRef<Path>) -> io::Result<()>
 /// propagate into OUT_DIR. If not present, when trying to rewrite a file, a `Permission denied`
 /// error will occur.
 fn copy_with_cp(from: impl AsRef<Path>, to: impl AsRef<Path>) -> io::Result<()> {
-    let status = Command::new("cp")
+    match Command::new("cp")
         .arg("--no-preserve=mode,ownership")
         .arg("-R")
         .arg(from.as_ref().to_str().unwrap())
         .arg(to.as_ref().to_str().unwrap())
-        .status()?;
-
-    if status.success() {
-        return Ok(());
+        .status()
+    {
+        Ok(status) if status.success() => Ok(()),
+        _ => match fs::copy(from.as_ref(), to.as_ref()) {
+            Err(err) if err.kind() == io::ErrorKind::InvalidInput => copy_dir_all(from, to),
+            Ok(_) => Ok(()),
+            Err(err) => Err(err),
+        },
     }
-
-    return match fs::copy(from.as_ref(), to.as_ref()) {
-        Err(err) if err.kind() == io::ErrorKind::InvalidInput => copy_dir_all(from, to),
-        Ok(_) => Ok(()),
-        Err(err) => Err(err),
-    };
 }
 
 fn make_amalgamation() {
@@ -486,6 +484,8 @@ fn build_multiple_ciphers(target: &str, out_path: &Path) {
             "x86_64"
         } else if cc.contains("aarch64") {
             "arm64"
+        } else if cc.contains("arm") {
+            "arm"
         } else {
             panic!("Unsupported cross target {}", cc)
         };

libsql-ffi/build.rs

@@ -279,7 +279,8 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux"
   # Do not set `-maes -msee4.2` when we are on arm which doesn't support
   # this instruction set.
   if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64"
-      OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
+      OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64"
+      OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
   else()
@@ -298,7 +299,9 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux"
   set(SHARED_LIB_EXPORT_DEFINITION "__attribute__((visibility(\"default\")))")
 else()
   if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT (
-      CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64"
+      CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64"
+      OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64"
+      OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm"
   ))
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.2 -maes")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -maes")
@@ -307,7 +310,9 @@ else()
 endif()
 
 if (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT (
-      CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64"
+      CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64"
+      OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64"
+      OR CMAKE_SYSTEM_PROCESSOR STREQUAL "arm"
   ))
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.2 -maes -Wno-error=incompatible-function-pointer-types")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2 -maes")