commit: a3a6f5a96c0325fb3d22bb3fe7a974aa8bba9aba Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Thu Sep 11 13:50:47 2025 +0000 Commit: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> CommitDate: Thu Sep 11 13:50:53 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a3a6f5a9
sci-ml/ollama: update GNUInstallDirs patch changed in https://github.com/ollama/ollama/pull/12000 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> .../files/ollama-9999-use-GNUInstallDirs.patch | 26 ++++++++++++++++++++++ sci-ml/ollama/ollama-9999.ebuild | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/sci-ml/ollama/files/ollama-9999-use-GNUInstallDirs.patch b/sci-ml/ollama/files/ollama-9999-use-GNUInstallDirs.patch new file mode 100644 index 0000000000..6c410be731 --- /dev/null +++ b/sci-ml/ollama/files/ollama-9999-use-GNUInstallDirs.patch @@ -0,0 +1,26 @@ +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 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -35,8 +35,9 @@ 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/${OLLAMA_RUNNER_DIR}) ++include(GNUInstallDirs) ++set(OLLAMA_BUILD_DIR ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/ollama) ++set(OLLAMA_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/ollama/${OLLAMA_RUNNER_DIR}) + + 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 924b9b7b40..c8e23efd95 100644 --- a/sci-ml/ollama/ollama-9999.ebuild +++ b/sci-ml/ollama/ollama-9999.ebuild @@ -73,7 +73,7 @@ RDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-0.6.3-use-GNUInstallDirs.patch" + "${FILESDIR}/${PN}-9999-use-GNUInstallDirs.patch" ) pkg_pretend() {
