[Glibc-bsd-commits] r6095 - trunk/freebsd-buildutils/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-07-19 09:19:30 +0000 (Tue, 19 Jul 2016)
New Revision: 6095

Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/rules
Log:
* Use architecture.mk instead of individual calls to dpkg-architecture
* Reduce the diff against freebsd-libs debian/rules


Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2016-07-19 09:15:46 UTC (rev 6094)
+++ trunk/freebsd-buildutils/debian/changelog	2016-07-19 09:19:30 UTC (rev 6095)
@@ -3,6 +3,7 @@
   * Add Build-Depends: dpkg-dev (>= 1.16.1.1) and use buildflags.mk
     to set CFLAGS, respecting DEB_BUILD_OPTIONS flags such as noopt
   * Enable hardening=+all, which includes PIE, relro and stack protector
+  * Use architecture.mk instead of individual calls to dpkg-architecture
 
  -- Steven Chamberlain <stevenc at debian.org>  Tue, 19 Jul 2016 10:13:07 +0100
 

Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2016-07-19 09:15:46 UTC (rev 6094)
+++ trunk/freebsd-buildutils/debian/rules	2016-07-19 09:19:30 UTC (rev 6095)
@@ -5,22 +5,28 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+full_version	:= $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
+tar_version	:= $(shell echo $(full_version) | sed -e 's/-.*//g')
+svn_revision	:= $(shell echo $(full_version) | sed -e 's/.*~svn\([0-9]*\)-[0-9]*/\1/g' -e 's/^$(full_version)$$/HEAD/g')
+version		:= $(shell echo $(full_version) | sed -e 's/[~+-].*//g')
+pversion	:= $(shell echo $(version) | sed -e 's/\./_/g')
+major           := $(shell echo $(version) | sed -e 's/\..*//g')
+revision	:= $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
+
+include /usr/share/dpkg/architecture.mk
+
 # Determine host architecture compiler
-DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 ifeq ($(origin CC),default)
 CC := $(DEB_HOST_GNU_TYPE)-gcc
 endif
 
+# Use hardening flags
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+# Pre-define CFLAGS, for hardening, debug and optimisation level
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
-# 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_ARCH_CPU	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-DEB_HOST_ARCH_OS	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-
 MACHINE_ARCH		:= $(DEB_HOST_ARCH_CPU)
 MACHINE_MULTIARCH	:= $(DEB_HOST_MULTIARCH)
 
@@ -32,14 +38,6 @@
     export STRIPFLAG=
 endif
 
-full_version	:= $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
-tar_version	:= $(shell echo $(full_version) | sed -e 's/-.*//g')
-svn_revision	:= $(shell echo $(full_version) | sed -e 's/.*~svn\([0-9]*\)-[0-9]*/\1/g' -e 's/^$(full_version)$$/HEAD/g')
-version		:= $(shell echo $(full_version) | sed -e 's/[~+-].*//g')
-pversion	:= $(shell echo $(version) | sed -e 's/\./_/g')
-major           := $(shell echo $(version) | sed -e 's/\..*//g')
-revision	:= $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
-
 SVN_BASE	:= https://svn.freebsd.org/base
 #SVN		:= $(SVN_BASE)/release/$(version).0
 SVN		:= $(SVN_BASE)/releng/$(version)