On Sun, Jul 03, 2005 at 11:31:32AM +0100, Colin Watson wrote: > Please apply the attached patch
Sorry, really attached this time. -- Colin Watson [EMAIL PROTECTED]
--- dbs-0.35.orig/dpkg-arch.mk 2001-08-30 00:20:45.000000000 +0100 +++ dbs-0.35/dpkg-arch.mk 2005-07-03 11:23:22.000000000 +0100 @@ -1,7 +1,38 @@ # see dpkg-architecture(8) DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH) +DEB_BUILD_ARCH_CPU := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null) +DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS 2>/dev/null) DEB_BUILD_GNU_CPU := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) DEB_BUILD_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM) DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null) +DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null) +DEB_HOST_GNU_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) + +# Take account of old dpkg-architecture output. +ifeq ($(DEB_BUILD_ARCH_CPU),) + DEB_BUILD_ARCH_CPU := $(DEB_BUILD_GNU_CPU) + ifeq ($(DEB_BUILD_ARCH_CPU),x86_64) + DEB_BUILD_ARCH_CPU := amd64 + endif +endif +ifeq ($(DEB_BUILD_ARCH_OS),) + DEB_BUILD_ARCH_OS := $(subst -gnu,,$(DEB_BUILD_GNU_SYSTEM)) + ifeq ($(DEB_BUILD_ARCH_OS),gnu) + DEB_BUILD_ARCH_OS := hurd + endif +endif +ifeq ($(DEB_HOST_ARCH_CPU),) + DEB_HOST_ARCH_CPU := $(DEB_HOST_GNU_CPU) + ifeq ($(DEB_HOST_ARCH_CPU),x86_64) + DEB_HOST_ARCH_CPU := amd64 + endif +endif +ifeq ($(DEB_HOST_ARCH_OS),) + DEB_HOST_ARCH_OS := $(subst -gnu,,$(DEB_HOST_GNU_SYSTEM)) + ifeq ($(DEB_HOST_ARCH_OS),gnu) + DEB_HOST_ARCH_OS := hurd + endif +endif
