From e9d0e09c6d81aa1ca979dd94984d645e25adcc04 Mon Sep 17 00:00:00 2001 From: Jonathan McCrohan Date: Mon, 25 Jun 2012 17:37:45 +0100 Subject: Backport upstream commit eeaf804 --- .../01-Allow-buildflags-to-be-overridden.patch | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 debian/patches/01-Allow-buildflags-to-be-overridden.patch (limited to 'debian/patches/01-Allow-buildflags-to-be-overridden.patch') diff --git a/debian/patches/01-Allow-buildflags-to-be-overridden.patch b/debian/patches/01-Allow-buildflags-to-be-overridden.patch new file mode 100644 index 0000000..03414ae --- /dev/null +++ b/debian/patches/01-Allow-buildflags-to-be-overridden.patch @@ -0,0 +1,47 @@ +From eeaf8047c61fd8dc2eb12240100a8e18f72a9ace Mon Sep 17 00:00:00 2001 +From: Jonathan McCrohan +Date: Sun, 10 Jun 2012 23:12:44 +0100 +Subject: [PATCH] Allow buildflags to be overridden + +Required by Debian debhelper to enable build hardening: +http://wiki.debian.org/Hardening + +Signed-off-by: Jonathan McCrohan +Signed-off-by: Gerrit Renker +--- + Makefile.in | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index b7d8ece..0b27ad7 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -8,10 +8,12 @@ datadir = $(datarootdir)/@PACKAGE_NAME@ + exec_perms = 0755 + install-suid-root: exec_perms = 4755 + +-CC = @CC@ +-CFLAGS = @CFLAGS@ +-DEFS = @DEFS@ +-LDLIBS = @LIBS@ ++CC ?= @CC@ ++CFLAGS ?= @CFLAGS@ ++CPPFLAGS ?= @CPPFLAGS@ ++LDFLAGS ?= @LDFLAGS@ ++DEFS ?= @DEFS@ ++LDLIBS ?= @LIBS@ + + INSTALL = @INSTALL@ + RM = rm -vf +@@ -23,7 +25,7 @@ OBJS = $(PURESRC:.c=.o) + DOCS = README NEWS THANKS AUTHORS COPYING ChangeLog + + %.o: %.c $(HEADERS) +- $(CC) $(CFLAGS) $(DEFS) -c -o $@ $< ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DEFS) -c -o $@ $< + + all: @PACKAGE_NAME@ + @PACKAGE_NAME@: $(MAIN) $(OBJS) +-- +1.7.10 + -- cgit v1.2.3