commit: d6f54e081ced5b69a926f72aac6c3779cf3ba0f1 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Wed Nov 19 02:38:15 2025 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Wed Nov 19 02:41:49 2025 +0000 URL: https://gitweb.gentoo.org/repo/dev/tamiko.git/commit/?id=d6f54e08
sci-ml/ollama: update live ebuild Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> ...rs.patch => ollama-0.12.11-use-GNUInstallDirs.patch} | 17 +++-------------- sci-ml/ollama/ollama-9999.ebuild | 4 ++-- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/sci-ml/ollama/files/ollama-0.6.3-use-GNUInstallDirs.patch b/sci-ml/ollama/files/ollama-0.12.11-use-GNUInstallDirs.patch similarity index 51% rename from sci-ml/ollama/files/ollama-0.6.3-use-GNUInstallDirs.patch rename to sci-ml/ollama/files/ollama-0.12.11-use-GNUInstallDirs.patch index 5a69109..a8d1a47 100644 --- a/sci-ml/ollama/files/ollama-0.6.3-use-GNUInstallDirs.patch +++ b/sci-ml/ollama/files/ollama-0.12.11-use-GNUInstallDirs.patch @@ -1,26 +1,15 @@ -From 3e250053458fa33c97023ff8943e8c5daa4beeca Mon Sep 17 00:00:00 2001 -From: Paul Zander <[email protected]> -Date: Mon, 31 Mar 2025 18:07:47 +0200 -Subject: [PATCH] use GNUInstallDirs - -Signed-off-by: Paul Zander <[email protected]> - diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9e107fe..79407ea 100644 +index 50a80629..30ed831a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -35,8 +35,9 @@ if (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") +@@ -37,8 +37,8 @@ if (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") set(CMAKE_INSTALL_RPATH "@loader_path") endif() -set(OLLAMA_BUILD_DIR ${CMAKE_BINARY_DIR}/lib/ollama) --set(OLLAMA_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/ollama) -+include(GNUInstallDirs) +-set(OLLAMA_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/ollama/${OLLAMA_RUNNER_DIR}) +set(OLLAMA_BUILD_DIR ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/ollama) +set(OLLAMA_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/ollama) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OLLAMA_BUILD_DIR}) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${OLLAMA_BUILD_DIR}) --- -2.49.0 - diff --git a/sci-ml/ollama/ollama-9999.ebuild b/sci-ml/ollama/ollama-9999.ebuild index a5af406..b9d30fe 100644 --- a/sci-ml/ollama/ollama-9999.ebuild +++ b/sci-ml/ollama/ollama-9999.ebuild @@ -66,7 +66,7 @@ RDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-0.6.3-use-GNUInstallDirs.patch" + "${FILESDIR}/${PN}-0.12.11-use-GNUInstallDirs.patch" ) src_unpack() { @@ -101,7 +101,7 @@ src_prepare() { -e "s#\"lib/ollama\"#\"$(get_libdir)/ollama\"#" \ -i \ ml/backend/ggml/ggml/src/ggml.go \ - discover/path.go \ + ml/path.go \ || die if use amd64; then
