From 33a34ec3fb821679e37b40bc6becf8287888dcec Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Sat, 27 Sep 2025 09:27:33 +0200 Subject: [PATCH 1/2] chore(deps): bump llama.cpp to '72b24d96c6888c609d562779a23787304ae4609c' Signed-off-by: Ettore Di Giacinto --- backend/cpp/llama-cpp/CMakeLists.txt | 3 ++- backend/cpp/llama-cpp/Makefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/cpp/llama-cpp/CMakeLists.txt b/backend/cpp/llama-cpp/CMakeLists.txt index c839800b86af..5ba099eeba66 100644 --- a/backend/cpp/llama-cpp/CMakeLists.txt +++ b/backend/cpp/llama-cpp/CMakeLists.txt @@ -66,7 +66,8 @@ target_link_libraries(${TARGET} PRIVATE common llama mtmd ${CMAKE_THREAD_LIBS_IN absl::flags_parse gRPC::${_REFLECTION} gRPC::${_GRPC_GRPCPP} - protobuf::${_PROTOBUF_LIBPROTOBUF}) + protobuf::${_PROTOBUF_LIBPROTOBUF} + ssl crypto) target_compile_features(${TARGET} PRIVATE cxx_std_11) if(TARGET BUILD_INFO) add_dependencies(${TARGET} BUILD_INFO) diff --git a/backend/cpp/llama-cpp/Makefile b/backend/cpp/llama-cpp/Makefile index f9faeb7a3918..808462e5d40f 100644 --- a/backend/cpp/llama-cpp/Makefile +++ b/backend/cpp/llama-cpp/Makefile @@ -1,5 +1,5 @@ -LLAMA_VERSION?=835b2b915c52bcabcd688d025eacff9a07b65f52 +LLAMA_VERSION?=72b24d96c6888c609d562779a23787304ae4609c LLAMA_REPO?=https://github.com/ggerganov/llama.cpp CMAKE_ARGS?= From 9a9ae1f866229f52aa7830ee99ffee9b93b1d6a1 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Sat, 27 Sep 2025 11:14:53 +0200 Subject: [PATCH 2/2] Disable OPENSSL (just introduced upstream) Signed-off-by: Ettore Di Giacinto --- backend/cpp/llama-cpp/CMakeLists.txt | 3 +-- backend/cpp/llama-cpp/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/backend/cpp/llama-cpp/CMakeLists.txt b/backend/cpp/llama-cpp/CMakeLists.txt index 5ba099eeba66..c839800b86af 100644 --- a/backend/cpp/llama-cpp/CMakeLists.txt +++ b/backend/cpp/llama-cpp/CMakeLists.txt @@ -66,8 +66,7 @@ target_link_libraries(${TARGET} PRIVATE common llama mtmd ${CMAKE_THREAD_LIBS_IN absl::flags_parse gRPC::${_REFLECTION} gRPC::${_GRPC_GRPCPP} - protobuf::${_PROTOBUF_LIBPROTOBUF} - ssl crypto) + protobuf::${_PROTOBUF_LIBPROTOBUF}) target_compile_features(${TARGET} PRIVATE cxx_std_11) if(TARGET BUILD_INFO) add_dependencies(${TARGET} BUILD_INFO) diff --git a/backend/cpp/llama-cpp/Makefile b/backend/cpp/llama-cpp/Makefile index 808462e5d40f..969dd514ed27 100644 --- a/backend/cpp/llama-cpp/Makefile +++ b/backend/cpp/llama-cpp/Makefile @@ -1,5 +1,5 @@ -LLAMA_VERSION?=72b24d96c6888c609d562779a23787304ae4609c +LLAMA_VERSION?=ace6a54565444b6377bee8e7ac693238e7766279 LLAMA_REPO?=https://github.com/ggerganov/llama.cpp CMAKE_ARGS?= @@ -14,7 +14,7 @@ CMAKE_ARGS+=-DBUILD_SHARED_LIBS=OFF -DLLAMA_CURL=OFF CURRENT_MAKEFILE_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) ifeq ($(NATIVE),false) - CMAKE_ARGS+=-DGGML_NATIVE=OFF + CMAKE_ARGS+=-DGGML_NATIVE=OFF -DLLAMA_OPENSSL=OFF endif # If build type is cublas, then we set -DGGML_CUDA=ON to CMAKE_ARGS automatically ifeq ($(BUILD_TYPE),cublas)