[mig] 01/01: make the gnumach-dev dependency bootstrap-aware

[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 2ec478ff73d442062ae569e359899bfe20cb784a
Author: Samuel Thibault <address@hidden>
Date:   Tue Aug 18 18:44:17 2015 +0200

    make the gnumach-dev dependency bootstrap-aware
---
 debian/control.in | 2 +-
 debian/rules      | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/control.in b/debian/control.in
index e451720..77f2001 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -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.17.14), debhelper (>= 9), gnumach-dev, flex, 
bison,
+Build-Depends: dpkg-dev (>= 1.17.14), debhelper (>= 9), address@hidden@, flex, 
bison,
  dh-autoreconf
 Standards-Version: 3.9.3
 
diff --git a/debian/rules b/debian/rules
index a534710..323dc11 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@
 export DEB_CFLAGS_MAINT_PREPEND := -Wall -pipe
 
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_TARGET_ARCH := $(shell dpkg-architecture -qDEB_TARGET_ARCH)
 
 DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -27,11 +28,13 @@ ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_TARGET_GNU_TYPE))
 ARCH=any-i386
 else
 CROSS=-$(DEB_TARGET_GNU_TYPE)
+CROSSDEP=:$(DEB_TARGET_ARCH)
 ARCH=$(DEB_HOST_ARCH)
 endif
 debian/control: debian/control.stamp
 debian/control.stamp: debian/control.in
        sed -e 's/@cross@/$(CROSS)/' \
+           -e 's/@crossdep@/$(CROSSDEP)/' \
            -e 's/@arch@/$(ARCH)/' \
            < $< > debian/control
 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_TARGET_GNU_TYPE))
@@ -39,9 +42,11 @@ ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_TARGET_GNU_TYPE))
 endif
        touch $@
 
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_TARGET_GNU_TYPE))
 build-arch: debian/control.stamp
 build-indep:
 build: build-indep build-arch
+endif
 
 override_dh_auto_clean:
        dh_auto_clean

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