[gdal] 08/09: Use dpkg-architecture to set DEB_HOST_MULTIARCH if not already set.

[Bas Couwenberg]

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

sebastic pushed a commit to branch experimental-2.1
in repository gdal.

commit 70b19b00bf2e9400c591b248af8e1c42636a9c7d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jan 27 13:08:59 2017 +0100

    Use dpkg-architecture to set DEB_HOST_MULTIARCH if not already set.
---
 debian/changelog | 1 +
 debian/rules     | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0222d6a..e19c6c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ gdal (2.1.3+dfsg-1) UNRELEASED; urgency=medium
   * Update symbols for 2.1.3, add symbols for m68k.
   * Update watch file for final releases.
   * Strip pre-releases from ABI version when creating new symbols files.
+  * Use dpkg-architecture to set DEB_HOST_MULTIARCH if not already set.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 27 Jan 2017 12:39:07 +0100
 
diff --git a/debian/rules b/debian/rules
index d7dabe5..3f03c2c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,10 @@ GDAL_MAJOR=$(word 1,$(GDALVER))
 GDAL_MINOR=$(word 2,$(GDALVER))
 GDAL_PATCH=$(word 3,$(GDALVER))
 
+ifeq (,$(DEB_HOST_MULTIARCH))
+  DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+endif
+
 ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
   WITH_HDF5:=--with-hdf5=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
 else

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git