[mig] 01/01: rules, control: Support building a cross-compiling mig

[Samuel Thibault]

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

sthibault pushed a commit to branch master
in repository mig.

commit df62bc11bf952fc7d8c5c8ec33bca935d4479398
Author: Samuel Thibault <address@hidden>
Date:   Tue Aug 18 13:39:36 2015 +0200

    rules, control: Support building a cross-compiling mig
---
 debian/changelog               |  7 +++++++
 debian/control                 |  2 +-
 debian/{control => control.in} |  8 ++++----
 debian/rules                   | 33 +++++++++++++++++++++++++++++++--
 4 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f71b9ed..3ac7780 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mig (1.5-2) UNRELEASED; urgency=medium
+
+  * rules, control: Support building a cross-compiling mig.
+  * rules: Bump dpkg-dev build-dep version to get target triplet.
+
+ -- Samuel Thibault <address@hidden>  Tue, 18 Aug 2015 13:38:26 +0200
+
 mig (1.5-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index adef2a2..1419024 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Samuel Thibault <address@hidden>
 Homepage: http://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-hurd/mig.git
 Vcs-Git: git://anonscm.debian.org/pkg-hurd/mig.git
-Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 9), gnumach-dev, flex, 
bison,
+Build-Depends: dpkg-dev (>= 1.17.14), debhelper (>= 9), gnumach-dev, flex, 
bison,
  dh-autoreconf
 Standards-Version: 3.9.3
 
diff --git a/debian/control b/debian/control.in
similarity index 80%
copy from debian/control
copy to debian/control.in
index adef2a2..a46025c 100644
--- a/debian/control
+++ b/debian/control.in
@@ -6,13 +6,13 @@ Uploaders: Samuel Thibault <address@hidden>
 Homepage: http://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-hurd/mig.git
 Vcs-Git: git://anonscm.debian.org/pkg-hurd/mig.git
-Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 9), gnumach-dev, flex, 
bison,
+Build-Depends: dpkg-dev (>= 1.17.14), debhelper (>= 9), gnumach-dev, flex, 
bison,
  dh-autoreconf
 Standards-Version: 3.9.3
 
-Package: mig
-Architecture: any-i386
-Multi-Arch: foreign
+Package: address@hidden@
+Architecture: @arch@
+Multi-Arch: @multiarch@
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: GNU Mach Interface Generator
  This is the GNU distribution of the MIG, which is needed to compile
diff --git a/debian/rules b/debian/rules
index 4850e87..e49ffa0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,14 +7,43 @@
 
 export DEB_CFLAGS_MAINT_PREPEND := -Wall -pipe
 
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_TARGET_GNU_TYPE := $(shell dpkg-architecture -qDEB_TARGET_GNU_TYPE)
+
 %:
        dh $@ -Bbuild --with autoreconf
 
 override_dh_auto_configure:
        dh_auto_configure -Bbuild -- \
-         --libexecdir=/usr/lib/mig/
+         --libexecdir=/usr/lib/mig/ \
+         --build=$(DEB_BUILD_GNU_TYPE) \
+         --host=$(DEB_HOST_GNU_TYPE) \
+         --target=$(DEB_TARGET_GNU_TYPE)
+
+ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_TARGET_GNU_TYPE))
+ARCH=any-i386
+MULTIARCH=foreign
+else
+CROSS=-$(DEB_TARGET_GNU_TYPE)
+ARCH=$(DEB_HOST_ARCH)
+MULTIARCH=
+endif
+debian/control: debian/control.stamp
+debian/control.stamp: debian/control.in
+       sed -e 's/@cross@/$(CROSS)/' \
+           -e 's/@arch@/$(ARCH)/' \
+           -e 's/@multiarch@/$(MULTIARCH)/' \
+           < $< > debian/control
+       touch $@
+
+build-arch: debian/control.stamp
+build-indep:
+build: build-indep build-arch
 
 override_dh_auto_clean:
        dh_auto_clean
-       rm -rf build-aux
+       rm -rf build-aux debian/control.stamp
 

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