From: Bdale Garbee <bdale@gag.com>
Date: Tue, 25 Feb 2020 23:31:28 +0000 (-0700)
Subject: use more pre-baked dpkg Makefile snippets in rules file
X-Git-Tag: debian/1.10-1~2
X-Git-Url: https://git.gag.com/?p=debian%2Fgzip;a=commitdiff_plain;h=a6dd35f43487017a564e458cd8dc9a62e3c5fe47

use more pre-baked dpkg Makefile snippets in rules file
---

diff --git a/debian/rules b/debian/rules
index 87953a6..47273f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,28 +25,14 @@ endif
 endif
 
 export DEFS=NO_ASM # Avoid TEXTRELs on i386
-EXTRA_CFLAGS=		-Wall
-EXTRA_CPPFLAGS=
-
-ifeq (${DEB_HOST_ARCH},amd64)
-EXTRA_CPPFLAGS+=	-DUNALIGNED_OK
-endif
+DEB_CFLAGS_MAINT_APPEND := -Wall
+DEB_CPPFLAGS_MAINT_APPEND := -DUNALIGNED_OK
 
 # Automatic dpkg-buildflags selection, backport-friendly
 
-ifneq (,$(wildcard /usr/share/dpkg/buildflags.mk))
-# dpkg-dev (>= 1.16.1~)
-DEB_CFLAGS_MAINT_APPEND=${EXTRA_CFLAGS}
-DEB_CPPFLAGS_MAINT_APPEND=${EXTRA_CPPFLAGS}
 # maybe turn this on later
 #DEB_BUILD_MAINT_OPTIONS=hardening=+all
 include /usr/share/dpkg/buildflags.mk
-else
-# old-fashioned way to determine build flags
-CFLAGS=			-O$(if $(findstring noopt,${DEB_BUILD_OPTIONS}),0,2) -g
-CFLAGS+=		${EXTRA_CFLAGS}
-LDFLAGS+=		${EXTRA_LDFLAGS}
-endif
 
 # maybe turn this on later
 #ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))