[Reproducible-commits] [dpkg] 56/90: debian: Group all dpkg-architecture variables together

[Jérémy Bobbio]

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

lunar pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit 6703756a6c7610549a1f05d0e87cddac3fc563d5
Author: Guillem Jover <guillem at debian.org>
Date:   Sat Jun 27 03:09:26 2015 +0200

    debian: Group all dpkg-architecture variables together
---
 debian/rules | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/rules b/debian/rules
index f447cd7..950d8df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,20 +17,18 @@ dpkg_buildflags = \
 	DEB_CXXFLAGS_MAINT_APPEND="$(WFLAGS)" \
 	$(CURDIR)/run-script perl scripts/dpkg-buildflags.pl
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
+# Support cross-compiling.
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 	confflags += --build=$(DEB_HOST_GNU_TYPE)
 else
 	confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
 
-# Don't enable everything on all platforms
-DEB_HOST_ARCH_OS  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-
+# Do not enable everything on all platforms.
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 	confflags += --with-selinux
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git