From e1545bbeebc499a566e3722da7d14928d3b3264a Mon Sep 17 00:00:00 2001 From: Peter Pentchev Date: Thu, 18 Jun 2020 22:40:30 +0300 Subject: [PATCH] Use DEB_HOST_GNU_TYPE for the meson build directory. --- debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index 69bc1c6..fc50a26 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ DEB_BUILD_MAINT_OPTIONS= hardening=+all export DEB_BUILD_MAINT_OPTIONS -MARCH:= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +GARCH:= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) %: dh '$@' @@ -13,8 +13,8 @@ override_dh_auto_configure: dh_auto_configure -- -Dwith-openssl=disabled execute_after_dh_auto_test: - env PYTHONPATH=debian/tests python3 -B -m pychunk.roundtrip -d 'obj-${MARCH}/src' -f '/usr/share/dict/american-english' - env PYTHONPATH=debian/tests python3 -B -m pychunk.roundtrip -d 'obj-${MARCH}/src' -f "$$(readlink -f -- "$$(command -v gcc)")" + env PYTHONPATH=debian/tests python3 -B -m pychunk.roundtrip -d 'obj-${GARCH}/src' -f '/usr/share/dict/american-english' + env PYTHONPATH=debian/tests python3 -B -m pychunk.roundtrip -d 'obj-${GARCH}/src' -f "$$(readlink -f -- "$$(command -v gcc)")" override_dh_makeshlibs: dh_makeshlibs -- -c4 -- 2.30.2