aboutsummaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2012-02-20 18:18:13 -0500
committerTheodore Ts'o <tytso@mit.edu>2012-02-20 18:18:13 -0500
commit5d0e1f99bc5d2b2c718fd89642799819f222772e (patch)
tree1df2e70fee1a6fe037b53e7165f0ee0286cba84a /debian
parentf921eda1ab9c865a560edd7d61f98089128c04f3 (diff)
downloade2fsprogs-5d0e1f99bc5d2b2c718fd89642799819f222772e.tar.gz
e2fsprogs-5d0e1f99bc5d2b2c718fd89642799819f222772e.tar.xz
e2fsprogs-5d0e1f99bc5d2b2c718fd89642799819f222772e.zip
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" <tytso@mit.edu>
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/rules9
1 files changed, 3 insertions, 6 deletions
diff --git a/debian/rules b/debian/rules
index a4261bf2..484d4118 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