[asl] 22/27: Use DEB_HOST_MULTIARCH for multiarch path injection.

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Sat Nov 26 16:35:44 UTC 2016


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/master
in repository asl.

commit ded4693815b100f76ca59afec8dd7739d794cc53
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Nov 23 11:13:33 2016 +0000

    Use DEB_HOST_MULTIARCH for multiarch path injection.
---
 debian/rules | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 8fabaa6..64b9c7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,9 +8,11 @@ export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
 export DEB_CXXFLAGS_MAINT_APPEND = -Wall -pedantic
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture --query DEB_HOST_MULTIARCH)
+
 BUILD_OPTIONS = \
 	-DBUILD_SHARED_LIBS=ON \
-	-DCMAKE_LIBRARY_ARCHITECTURE="$(DEB_TARGET_MULTIARCH)" \
+	-DCMAKE_LIBRARY_ARCHITECTURE="$(DEB_HOST_MULTIARCH)" \
 	-DWITH_EXAMPLES=OFF \
 	-DWITH_MATIO=ON \
 	-DWITH_TESTS=OFF

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/asl.git



More information about the debian-science-commits mailing list