[SCM] rtmpdump/master: Use correct toolchain when cross-building

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Wed May 1 10:12:49 UTC 2013


The following commit has been merged in the master branch:
commit 5f4714259e36a138ae2bab16c8aaf90b9536db17
Author: Colin Watson <cjwatson at ubuntu.com>
Date:   Wed May 1 12:08:58 2013 +0200

    Use correct toolchain when cross-building
    
    rtmpdump fails to cross-build because it uses the native compiler, but
    upstream supports cross-building so it's really easy to fix this by
    adding another item to MAKEVARS.

diff --git a/debian/rules b/debian/rules
index fd16a5a..6a58919 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,12 @@
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 MAKEVARS=prefix=/usr CRYPTO=GNUTLS libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	MAKEVARS += CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)-
+endif
+
 override_dh_auto_build:
 	dh_auto_build -- $(MAKEVARS)
 

-- 
rtmpdump packaging



More information about the pkg-multimedia-commits mailing list