[libfann] 01/02: d/rules: Build result uses DEB_HOST_GNU_TYPE

[Christian Kastner]

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

chrisk-guest pushed a commit to annotated tag debian/2.2.0+ds-2
in repository libfann.

commit d241ab26ef10e0de1e510553e09f0fb58b0bf3ef
Author: Christian Kastner <ckk at kvr.at>
Date:   Sun Oct 11 19:03:40 2015 +0200

    d/rules: Build result uses DEB_HOST_GNU_TYPE
    
    Build result used DEB_HOST_GNU_TYPE, not DEB_HOST_MULTIARCH. The latter causes
    a FTBFS on i386.
---
 debian/rules | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 4583a12..36a09c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,8 @@ UPVER := $(shell dpkg-parsechangelog -l$(PKGDIR)/debian/changelog -S Version | \
 		sed -re 's/\+ds-.*//')
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
 export DEB_CFLAGS_MAINT_APPEND = -Wall
 
 
@@ -43,8 +45,8 @@ override_dh_auto_test-arch:
 	testrundir=$$(mktemp -d) ;\
 		ADTTMP=$$testrundir \
 		CPATH=$(CURDIR)/src/include \
-		LIBRARY_PATH=$(CURDIR)/obj-$(DEB_HOST_MULTIARCH)/src/ \
-		LD_LIBRARY_PATH=$(CURDIR)/obj-$(DEB_HOST_MULTIARCH)/src/ \
+		LIBRARY_PATH=$(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)/src/ \
+		LD_LIBRARY_PATH=$(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)/src/ \
 	/bin/sh $(CURDIR)/debian/tests/build ;\
 	res=$$? ;\
 	rm -rf "$$testrundir" ;\

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