From: Mathieu Baudier <redacted>
Date: Tue, 21 Jan 2025 11:45:38 +0000 (+0100)
Subject: Install GGML backends in libexec
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=21b69cb17bd8f84096f3887e1fe5e8a8e37640a1;p=pkg%2Fggml%2Fsources%2Fggml

Install GGML backends in libexec
---

diff --git a/debian/libggml-blas.install b/debian/libggml-blas.install
index 130b7bab..985f7e75 100644
--- a/debian/libggml-blas.install
+++ b/debian/libggml-blas.install
@@ -1 +1 @@
-/usr/lib/*/libggml-blas.so
+/usr/libexec/*/ggml/libggml-blas.so
diff --git a/debian/libggml-cpu.install b/debian/libggml-cpu.install
index f2f99f4d..277c4409 100644
--- a/debian/libggml-cpu.install
+++ b/debian/libggml-cpu.install
@@ -1 +1 @@
-/usr/lib/*/libggml-cpu*.so
+/usr/libexec/*/ggml/libggml-cpu*.so
diff --git a/debian/libggml-rpc.install b/debian/libggml-rpc.install
index 1a61a7a0..ad63249f 100644
--- a/debian/libggml-rpc.install
+++ b/debian/libggml-rpc.install
@@ -1 +1 @@
-/usr/lib/*/libggml-rpc.so
+/usr/libexec/*/ggml/libggml-rpc.so
diff --git a/debian/libggml-vulkan.install b/debian/libggml-vulkan.install
index aef8ce08..cbdccf66 100644
--- a/debian/libggml-vulkan.install
+++ b/debian/libggml-vulkan.install
@@ -1 +1 @@
-/usr/lib/*/libggml-vulkan.so
+/usr/libexec/*/ggml/libggml-vulkan.so
diff --git a/debian/rules b/debian/rules
index c6374e49..d704a7c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,7 @@ include /usr/share/dpkg/architecture.mk
 
 build_multiarch=build/$(DEB_HOST_MULTIARCH)
 install_lib_multiarch=debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+install_libexec_multiarch=debian/tmp/usr/libexec/$(DEB_HOST_MULTIARCH)
 
 # parallelism
 DEB_BUILD_OPTIONS ?= parallel=8
@@ -54,12 +55,14 @@ override_dh_auto_configure:
 
 override_dh_auto_install:
 	dh_auto_install
+	
 	# Since no CMake install configuration is available for the libggml-* backend target:
 	# - we set CMAKE_SKIP_BUILD_RPATH=ON during build
-	# - we install the backends explicitly in the dist tree
+	# - we install the backends explicitly in libexec so that executables can be installed with them
+	mkdir -p $(install_libexec_multiarch)/ggml
 	for file in $(build_multiarch)/bin/libggml-*.so; do \
     	patchelf --set-soname $$(basename "$$file") $$file; \
-		install -t $(install_lib_multiarch) $$file; \
+		install -t $(install_libexec_multiarch)/ggml $$file; \
 	done
 
 override_dh_dwz: