[Glibc-bsd-commits] r6045 - trunk/freebsd-libs/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-05-06 12:38:31 +0000 (Fri, 06 May 2016)
New Revision: 6045

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/rules
Log:
Use architecture.mk instead of individual calls to dpkg-architecture


Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2016-05-06 12:36:42 UTC (rev 6044)
+++ trunk/freebsd-libs/debian/changelog	2016-05-06 12:38:31 UTC (rev 6045)
@@ -7,6 +7,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 <steven at pyro.eu.org>  Fri, 06 May 2016 12:23:46 +0100
 

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2016-05-06 12:36:42 UTC (rev 6044)
+++ trunk/freebsd-libs/debian/rules	2016-05-06 12:38:31 UTC (rev 6045)
@@ -2,14 +2,6 @@
 # -*- makefile -*-
 # Sample debian/rules that uses debhelper.
 
-DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-# 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
-
 SHELL = bash
 
 # Uncomment this to turn on verbose mode.
@@ -25,6 +17,13 @@
 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
+ifeq ($(origin CC),default)
+CC := $(DEB_HOST_GNU_TYPE)-gcc
+endif
+
 # Use hardening flags
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all