[SCM] x264/master: Fix cross compilation

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d55555f40cc5e136e1efb443c4832d95d6b30871
Author: Sebastian Ramacher <sebastian at ramacher.at>
Date:   Fri Sep 23 20:26:40 2016 +0200

    Fix cross compilation

diff --git a/debian/changelog b/debian/changelog
index a894260..68779a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ x264 (2:0.148.2708+git86b7198-1) unstable; urgency=medium
   * Update to new stable upstream
   * Imported Upstream version 0.148.2708+git86b7198
 
+  [ Helmut Grohne ]
+  * Fix FTCBFS: Pass cross flags to configure. (Closes: #838317)
+
  -- Rico Tzschichholz <ricotz at ubuntu.com>  Wed, 21 Sep 2016 22:59:37 +0200
 
 x264 (2:0.148.2699+gita5e06b9-1) unstable; urgency=medium
diff --git a/debian/confflags b/debian/confflags
index a373059..c498193 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -20,6 +20,10 @@ endif
 
 common_confflags += --prefix=/usr --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+common_confflags += --host=$(DEB_HOST_GNU_TYPE) --cross-prefix=$(DEB_HOST_GNU_TYPE)-
+endif
+
 ifneq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
 common_confflags += --disable-avs --disable-ffms --disable-gpac
 endif

-- 
x264 packaging