From 14f3697a5a53fdcaca0f48d8235dffdc8a8ee07d Mon Sep 17 00:00:00 2001 From: Andreas Tille Date: Wed, 25 Apr 2012 22:06:18 +0200 Subject: [PATCH] Fix upstream makefile to enable hardening flags as well use debhelper 9 to support hardening --- debian/changelog | 3 +++ debian/compat | 2 +- debian/control | 2 +- debian/patches/series | 1 + debian/patches/use-dpkg-buildflags.patch | 11 +++++++++++ 5 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 debian/patches/use-dpkg-buildflags.patch diff --git a/debian/changelog b/debian/changelog index bcd842a..84034b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,9 @@ tabix (0.2.5-2) UNRELEASED; urgency=low - Standards-Version: 3.9.3 (no changes needed) - removed cdbs from Build-Depends * debian/rules: Switched to dh to easily enable hardening flags + * debhelper 9 (control+compat) to enable building with hardening + flags + * debian/patches/use-dpkg-buildflags.patch: Regard hardening flags -- Andreas Tille Wed, 25 Apr 2012 17:02:10 +0200 diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index 48deb98..40d7181 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian Med Packaging Team , Andreas Tille -Build-Depends: debhelper (>= 8), zlib1g-dev +Build-Depends: debhelper (>= 9), zlib1g-dev Standards-Version: 3.9.3 Homepage: http://samtools.sourceforge.net/tabix.shtml Vcs-Git: git://git.debian.org/debian-med/tabix.git diff --git a/debian/patches/series b/debian/patches/series index f51f525..2effa73 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ count-set-but-not-used.patch +use-dpkg-buildflags.patch diff --git a/debian/patches/use-dpkg-buildflags.patch b/debian/patches/use-dpkg-buildflags.patch new file mode 100644 index 0000000..7856be7 --- /dev/null +++ b/debian/patches/use-dpkg-buildflags.patch @@ -0,0 +1,11 @@ +--- tabix.orig/Makefile ++++ tabix/Makefile +@@ -12,7 +12,7 @@ + .SUFFIXES:.c .o + + .c.o: +- $(CC) -c $(CFLAGS) $(DFLAGS) $(INCLUDES) $< -o $@ ++ $(CC) -c $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(DFLAGS) $(LDFLAGS) $(INCLUDES) $< -o $@ + + all-recur lib-recur clean-recur cleanlocal-recur install-recur: + @target=`echo $@ | sed s/-recur//`; \ -- 2.30.2