diff options
Diffstat (limited to 'misc/shimmy/files')
| -rw-r--r-- | misc/shimmy/files/patch-Cargo.toml | 17 | ||||
| -rw-r--r-- | misc/shimmy/files/patch-cargo-crates_shimmy-llama-cpp-sys-2-0.1.123_build.rs (renamed from misc/shimmy/files/llama-cpp-rs/patch-llama-cpp-sys-2_build.rs) | 8 |
2 files changed, 4 insertions, 21 deletions
diff --git a/misc/shimmy/files/patch-Cargo.toml b/misc/shimmy/files/patch-Cargo.toml deleted file mode 100644 index 02c923822f41..000000000000 --- a/misc/shimmy/files/patch-Cargo.toml +++ /dev/null @@ -1,17 +0,0 @@ ---- Cargo.toml.orig 2025-09-23 13:26:34 UTC -+++ Cargo.toml -@@ -98,11 +98,11 @@ reqwest = { version = "0.11", features = ["json", "rus - reqwest = { version = "0.11", features = ["json", "rustls-tls"], default-features = false } - - # llama.cpp bindings (optional) - using forked version with macOS ARM64 i8mm fix --llama-cpp-2 = { version = "0.1.118", optional = true, default-features = false } -+#llama-cpp-2 = { version = "0.1.118", optional = true, default-features = false } - - # Use forked llama-cpp-2 with macOS ARM64 i8mm compatibility fix --[patch.crates-io] --llama-cpp-2 = { git = "https://github.com/Michael-A-Kuykendall/llama-cpp-rs.git", branch = "fix-macos-arm64-i8mm", package = "llama-cpp-2" } -+#[patch.crates-io] -+llama-cpp-2 = { git = "https://github.com/Michael-A-Kuykendall/llama-cpp-rs.git", branch = "fix-macos-arm64-i8mm", package = "llama-cpp-2", optional = true, default-features = false } - - [dev-dependencies] - tokio-tungstenite = "0.20" diff --git a/misc/shimmy/files/llama-cpp-rs/patch-llama-cpp-sys-2_build.rs b/misc/shimmy/files/patch-cargo-crates_shimmy-llama-cpp-sys-2-0.1.123_build.rs index de8f6436d05a..3c6a0ab9435a 100644 --- a/misc/shimmy/files/llama-cpp-rs/patch-llama-cpp-sys-2_build.rs +++ b/misc/shimmy/files/patch-cargo-crates_shimmy-llama-cpp-sys-2-0.1.123_build.rs @@ -1,5 +1,5 @@ ---- llama-cpp-sys-2/build.rs.orig 2025-09-12 14:16:40 UTC -+++ llama-cpp-sys-2/build.rs +--- cargo-crates/shimmy-llama-cpp-sys-2-0.1.123/build.rs.orig 2006-07-24 01:21:28 UTC ++++ cargo-crates/shimmy-llama-cpp-sys-2-0.1.123/build.rs @@ -20,6 +20,7 @@ enum TargetOs { Apple(AppleVariant), Linux, @@ -17,7 +17,7 @@ } else { Err(target) } -@@ -632,7 +635,7 @@ fn main() { +@@ -648,7 +651,7 @@ fn main() { config.cflag("/FS"); config.cxxflag("/FS"); } @@ -26,7 +26,7 @@ println!("cargo:rustc-link-lib=vulkan"); } _ => (), -@@ -738,6 +741,9 @@ fn main() { +@@ -754,6 +757,9 @@ fn main() { } TargetOs::Linux => { println!("cargo:rustc-link-lib=dylib=stdc++"); |