From dd0e23c81c3780599976e21b64a388c725f18dab Mon Sep 17 00:00:00 2001 From: adhoc Date: Wed, 24 Jan 2024 11:03:03 +0100 Subject: [PATCH] fix docker build --- Dockerfile | 2 +- libsql-ffi/build.rs | 3 ++- libsql-ffi/bundled/SQLite3MultipleCiphers/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index bdeec4b522..5fd755c7d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM rust:slim-bullseye AS chef RUN apt update \ && apt install -y libclang-dev clang \ build-essential tcl protobuf-compiler file \ - libssl-dev pkg-config git tcl \ + libssl-dev pkg-config git tcl cmake \ && apt clean \ && rm -rf /var/lib/apt/lists/* diff --git a/libsql-ffi/build.rs b/libsql-ffi/build.rs index 2bffd9a435..8aad5c53a7 100644 --- a/libsql-ffi/build.rs +++ b/libsql-ffi/build.rs @@ -252,7 +252,8 @@ fn build_multiple_ciphers(out_dir: &str, out_path: &Path) { #[cfg(feature = "libsql-wasm-experimental")] cmd.arg("-DLIBSQL_ENABLE_WASM_RUNTIME"); - cmd.output().unwrap(); + let out = cmd.output().unwrap(); + assert!(out.status.success(), "{:?}", out); std::fs::copy( format!("{BUNDLED_DIR}/SQLite3MultipleCiphers/build/libsqlite3mc_static.a"), format!("{out_dir}/libsqlite3mc.a"), diff --git a/libsql-ffi/bundled/SQLite3MultipleCiphers/CMakeLists.txt b/libsql-ffi/bundled/SQLite3MultipleCiphers/CMakeLists.txt index 73f46e52f3..55059925fb 100644 --- a/libsql-ffi/bundled/SQLite3MultipleCiphers/CMakeLists.txt +++ b/libsql-ffi/bundled/SQLite3MultipleCiphers/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.24.0.0) +cmake_minimum_required(VERSION 3.18.0.0) project(sqlite3mc) # Helper macro