From 5d0e1f99bc5d2b2c718fd89642799819f222772e Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Mon, 20 Feb 2012 18:18:13 -0500 Subject: [PATCH] debian: fix dpkg-buildflags so it works when the shell is dash The buildd's use dash as the shell, so we can't use >& in the rules file. This was causing the buildd-built e2fsprogs binary packages to be built without the hardening flags. Signed-off-by: "Theodore Ts'o" --- debian/rules | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/debian/rules b/debian/rules index a4261bf..484d411 100755 --- a/debian/rules +++ b/debian/rules @@ -116,12 +116,9 @@ INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 0755 DEFAULT_CFLAGS = -g -O2 DEFAULT_LDFLAGS = -Wl,-Bsymbolic-functions -CFLAGS = $(shell if dpkg-buildflags >& /dev/null; then \ - dpkg-buildflags --get CFLAGS; else echo $(DEFAULT_CFLAGS) ; fi) -LDFLAGS = $(shell if dpkg-buildflags >& /dev/null; then \ - dpkg-buildflags --get LDFLAGS; else echo $(DEFAULT_LDFLAGS) ; fi) -CPPFLAGS = $(shell if dpkg-buildflags >& /dev/null; then \ - dpkg-buildflags --get CPPFLAGS; fi) +CFLAGS += $(shell dpkg-buildflags --get CFLAGS) +LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS) +CPPFLAGS += $(shell dpkg-buildflags --get CPPFLAGS) ifeq (${DEB_HOST_ARCH},alpha) CFLAGS += -DHAVE_NETINET_IN_H -- 1.8.3.1