From de98d1f117cdb8b3aab874bb7b04de1fa879ebbf Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sat, 11 Jun 2022 13:01:12 -0500 Subject: [PATCH] debian/rules: rely on dpkg architecture.mk for DEB_HOST_* DEB_BUILD_* --- debian/rules | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/debian/rules b/debian/rules index 53b02a0474e..3ec1928e41f 100755 --- a/debian/rules +++ b/debian/rules @@ -15,6 +15,7 @@ # Debhelper support added via one of Joey Hess' example files. # See the debian/changelog for further historical information. +include /usr/share/dpkg/architecture.mk include /usr/share/dpkg/pkg-info.mk # Uncomment this to turn on verbose mode. @@ -77,16 +78,6 @@ menu_ver := $(major_ver) ###################################################################### -# Should these be exported like this (as autotools-dev recommends for -# the two vars below) or not? -export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -export DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) - -# As recommended by /usr/share/doc/autotools-dev/README.Debian.gz. -# Handle cross-compiling and don't make ./configure guess. -export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - # FOR AUTOCONF 2.52 AND NEWER ONLY ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) confflags += --build $(DEB_HOST_GNU_TYPE) -- 2.30.2