Skip to content
Browse files

Switch to dpkg-buildflags for build flags handling

Since dpkg 1.16.1 was uploaded to the archive, tmux builds without -O2.
This is not what we want, so redo flags handling by enabling hardening
options via dpkg-buildflags. To make debhelper export the flags itself,
switch to compat level 9.

Adjust build-deps accordingly.
  • Loading branch information...
1 parent 23b3e0f commit f19a5ff4ca65918ac0e45e051890b65da0250551 @orebokech orebokech committed Nov 3, 2011
Showing with 5 additions and 7 deletions.
  1. +1 −1 debian/compat
  2. +3 −2 debian/control
  3. +1 −4 debian/rules
View
2 debian/compat
@@ -1 +1 @@
-7
+9
View
5 debian/control
@@ -3,9 +3,10 @@ Section: admin
Priority: optional
Maintainer: Karl Ferdinand Ebert <kfebert@gmail.com>
Uploaders: Romain Francoise <rfrancoise@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev,
+Build-Depends: dpkg-dev (>= 1.16.1~),
+ debhelper (>= 8.9.4~),
+ libncurses5-dev,
libevent-dev (>> 2.0.10),
- hardening-includes
Standards-Version: 3.9.2
Homepage: http://tmux.sourceforge.net/
Vcs-Browser: http://git.debian.org/?p=collab-maint/tmux.git
View
5 debian/rules
@@ -1,9 +1,6 @@
#!/usr/bin/make -f
-include /usr/share/hardening-includes/hardening.make
-
-export CFLAGS += $(HARDENING_CFLAGS)
-export LDFLAGS += $(HARDENING_LDFLAGS)
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
%:
dh $@

0 comments on commit f19a5ff

Please sign in to comment.
Something went wrong with that request. Please try again.