From 7e6e24ad845b4318087048dfa120047fd113307d Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Fri, 25 Sep 2009 14:03:46 +0200 Subject: [PATCH] rules: Use DEB_HOST_ARCH_CPU instead of DEB_HOST_GNU_TYPE. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit … to check for the build host. --- debian/changelog | 4 +++- debian/rules | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e9fac98..a1ad6bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ rrdtool (1.4~rc2-1) experimental; urgency=low * debian/rules: - Remove config.h in the 'clean' target - this is created by configure but not cleaned up by any Makefile. + - Use DEB_HOST_ARCH_CPU instead of DEB_HOST_GNU_TYPE to check for the + build host. * debian/patches: - Removed bts494874-gnu-kfreebsd - included upstream. - Removed bts332766-negative-timestamps - included upstream. @@ -18,7 +20,7 @@ rrdtool (1.4~rc2-1) experimental; urgency=low * Added debian/README.source: - The file includes a pointer to /usr/share/doc/quilt/README.source. - -- Sebastian Harl Fri, 25 Sep 2009 13:57:40 +0200 + -- Sebastian Harl Fri, 25 Sep 2009 14:03:11 +0200 rrdtool (1.3.8-1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 73678ee..1a361eb 100755 --- a/debian/rules +++ b/debian/rules @@ -22,6 +22,8 @@ TCL_VERS := $(shell dpkg -s tcl-dev | grep '^Depends' \ #let's help configure to figure out our host/build system 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_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) + ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) CONFFLAGS += --build $(DEB_HOST_GNU_TYPE) else @@ -46,7 +48,7 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else #don't optimize on arm for now - #447041 -ifneq ($(DEB_HOST_GNU_TYPE), arm) +ifneq ($(DEB_HOST_ARCH_CPU), arm) CFLAGS += -O2 endif endif -- 2.30.2