aboutsummaryrefslogtreecommitdiff
path: root/misc/llama-cpp/files
diff options
context:
space:
mode:
Diffstat (limited to 'misc/llama-cpp/files')
-rw-r--r--misc/llama-cpp/files/llama-server.in4
-rw-r--r--misc/llama-cpp/files/patch-ggml_src_CMakeLists.txt20
2 files changed, 2 insertions, 22 deletions
diff --git a/misc/llama-cpp/files/llama-server.in b/misc/llama-cpp/files/llama-server.in
index f958b774a4fc..6eec15953978 100644
--- a/misc/llama-cpp/files/llama-server.in
+++ b/misc/llama-cpp/files/llama-server.in
@@ -55,8 +55,8 @@ llama_server_precmd()
fi
# ensure that the log file exists and has right permissions
- touch ${llama_server_log}
- chown ${llama_server_user} ${llama_server_log}
+ touch ${llama_server_log} ${pidfile}
+ chown ${llama_server_user} ${llama_server_log} ${pidfile}
chmod 640 ${llama_server_log}
}
diff --git a/misc/llama-cpp/files/patch-ggml_src_CMakeLists.txt b/misc/llama-cpp/files/patch-ggml_src_CMakeLists.txt
deleted file mode 100644
index 8135824e1b8b..000000000000
--- a/misc/llama-cpp/files/patch-ggml_src_CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-- workaround for https://github.com/ggerganov/llama.cpp/issues/11095
-
---- ggml/src/CMakeLists.txt.orig 2025-01-06 00:37:35 UTC
-+++ ggml/src/CMakeLists.txt
-@@ -152,15 +152,6 @@ endif()
- # posix_memalign came in POSIX.1-2001 / SUSv3
- # M_PI is an XSI extension since POSIX.1-2001 / SUSv3, came in XPG1 (1985)
-
--# Somehow in OpenBSD whenever POSIX conformance is specified
--# some string functions rely on locale_t availability,
--# which was introduced in POSIX.1-2008, forcing us to go higher
--if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-- add_compile_definitions(_XOPEN_SOURCE=700)
--else()
-- add_compile_definitions(_XOPEN_SOURCE=600)
--endif()
--
- # Data types, macros and functions related to controlling CPU affinity and
- # some memory allocation are available on Linux through GNU extensions in libc
- if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Android")