sci-ml/ollama: update GNUInstallDirs patch

changed in https://github.com/ollama/ollama/pull/12000
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
This commit is contained in:
Paul Zander
2025-09-11 15:50:47 +02:00
parent 3aeea5c9ea
commit a3a6f5a96c
2 changed files with 27 additions and 1 deletions

View File

@@ -0,0 +1,26 @@
From 3e250053458fa33c97023ff8943e8c5daa4beeca Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx+gentoo@gmail.com>
Date: Mon, 31 Mar 2025 18:07:47 +0200
Subject: [PATCH] use GNUInstallDirs
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
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

View File

@@ -73,7 +73,7 @@ RDEPEND="
"
PATCHES=(
"${FILESDIR}/${PN}-0.6.3-use-GNUInstallDirs.patch"
"${FILESDIR}/${PN}-9999-use-GNUInstallDirs.patch"
)
pkg_pretend() {