From 2a3bfae9deaaad5796f3d2b5934fc1e0b363d68d Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Tue, 2 Apr 2019 14:39:23 +0100 Subject: [PATCH] debian: Install tools with canonicalized multiarch prefix Create a symlink with $(DEB_HOST_GNU_TYPE) in the name for compatibility with AC_CHECK_TOOL. Signed-off-by: Simon McVittie <smcv@collabora.com> --- debian/rules | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 8f5c3503c..aaa4d8c16 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ binaries := $(shell dh_listpackages) confflags = \ --disable-Werror \ --disable-silent-rules \ - --enable-host-prefix=$(DEB_HOST_GNU_TYPE)- \ + --enable-host-prefix=$(DEB_HOST_MULTIARCH)- \ --libexecdir=\$${exec_prefix}/lib/libcapsule \ $(NULL) @@ -64,6 +64,14 @@ override_dh_auto_build: override_dh_auto_install: dh_auto_install + if [ $(DEB_HOST_MULTIARCH) != $(DEB_HOST_GNU_TYPE) ]; then \ + set -e; \ + cd debian/tmp/usr/bin; \ + for bin in $(DEB_HOST_MULTIARCH)-*; do \ + tail="$${bin#$(DEB_HOST_MULTIARCH)-}"; \ + ln -s "$$bin" "$(DEB_HOST_GNU_TYPE)-$$tail"; \ + done; \ + fi $(MAKE) -C debian/libGL-proxy-build install V=1 $(proxy_vars) \ DESTDIR=$(CURDIR)/debian/libGL-proxy-build/shims install -d debian/tmp/usr/lib/libcapsule/shims/lib/$(DEB_HOST_MULTIARCH) -- GitLab