From: Mathieu Baudier <redacted>
Date: Wed, 22 Jan 2025 09:11:46 +0000 (+0100)
Subject: Make Debian dev packages more robust
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=c06bea3fd4676d9544e30afff7d08be20e9b8027;p=pkg%2Fggml%2Fsources%2Fllama.cpp

Make Debian dev packages more robust
---

diff --git a/debian/control b/debian/control
index 9a4e5622..ca3098a2 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Package: libllama-dev
 Architecture: any
 Priority: optional
 Depends: ${misc:Depends},
- ggml-dev, libllama
+ ggml-dev, libllama (= ${binary:Version})
 Description: Inference of LLMs in pure C/C++ (development files)
  Llama.cpp inference of LLMs in pure C/C++ (development files).
 
@@ -46,6 +46,6 @@ Package: llama-cpp-dev
 Architecture: any
 Priority: optional
 Depends: ${misc:Depends},
- libllama-dev, libcurl4-openssl-dev, libssl-dev
+ libllama-dev (= ${binary:Version}), libcurl4-openssl-dev, libssl-dev
 Description: Inference of LLMs in pure C/C++ (common static library)
  Llama.cpp inference of LLMs in pure C/C++ (common static library).
diff --git a/debian/libllama-dev.install b/debian/libllama-dev.install
index 248d5cc4..d981e574 100644
--- a/debian/libllama-dev.install
+++ b/debian/libllama-dev.install
@@ -1,5 +1,5 @@
 /usr/include/llama*.h
 include/llama-cpp.h /usr/include/
 
-/usr/lib/pkgconfig/*.pc
+/usr/lib/*/pkgconfig/*.pc
 /usr/lib/*/cmake/llama/llama-*.cmake
diff --git a/debian/rules b/debian/rules
index cf89e354..25419ddc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ include /usr/share/dpkg/architecture.mk
 
 build_multiarch=build/$(DEB_HOST_MULTIARCH)
 install_bin=debian/tmp/usr/bin
+install_lib=debian/tmp/usr/lib
 install_lib_multiarch=debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
 install_libexec_multiarch=debian/tmp/usr/libexec/$(DEB_HOST_MULTIARCH)
 
@@ -43,6 +44,10 @@ override_dh_auto_install:
 		ln -s --relative -t $(install_bin) $(install_libexec_multiarch)/ggml/$$(basename "$$file"); \
 	done
 
+	# Multiarch pkgconfig
+	mkdir -p $(install_lib_multiarch)/pkgconfig
+	mv $(install_lib)/pkgconfig/*.pc $(install_lib_multiarch)/pkgconfig
+
 override_dh_auto_test:
 	# tests which depends on remote location are failing
 	dh_auto_test || true