[Build-common-hackers] Bug#218862: cdbs: fill DEB_*_GNU_{SYSTEM,CPU} in buildvars.mk

[Robert Millan]

This is a multi-part MIME message sent by reportbug.

--===============1166760232==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Package: cdbs
Version: 0.4.13
Severity: wishlist
Tags: patch

Hi!

This patch adds the lines in buildvars.mk to fill the missing
dpkg-architecture variables: DEB_{HOST,BUILD}_GNU_{SYSTEM,CPU}

It does also replace "=" with "?=" in assignments, in order to save
time in case dpkg-buildpackage already set these variables.

-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux aragorn 2.4.22-1-k7 #5 Sat Oct 4 14:11:12 EST 2003 i686
Locale: LANG=ca_ES@euro, LC_CTYPE=ca_ES@euro

-- no debconf information


--===============1166760232==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="cdbs.diff"

diff -ur cdbs-0.4.13.old/1/rules/buildvars.mk.in cdbs-0.4.13/1/rules/buildvars.mk.in
--- cdbs-0.4.13.old/1/rules/buildvars.mk.in	2003-08-22 20:55:00.000000000 +0200
+++ cdbs-0.4.13/1/rules/buildvars.mk.in	2003-11-03 02:31:14.000000000 +0100
@@ -54,10 +54,14 @@
 
 # Miscellaneous bits
 DEB_ARCH = $(shell dpkg --print-architecture)
-DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_BUILD_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 ifeq ($(words $(DEB_PACKAGES)),1)
 	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_PACKAGES))

--===============1166760232==--