[mupen64plus-core] 41/310: Use hardening-includes for CFLAGS and LDFLAGS hardened builds

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.

commit 91821a437296f6bc9d1e3efb723de4b8d78b27a8
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Wed Sep 8 14:35:10 2010 +0200

    Use hardening-includes for CFLAGS and LDFLAGS hardened builds
---
 debian/changelog | 1 +
 debian/control   | 4 ++--
 debian/rules     | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 22f73b6..8881a37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ mupen64plus-core (1.99.4~hg20100511-1) UNRELEASED; urgency=low
   * Upgrade debhelper compat to v8
   * set *FLAGS using dpkg-buildflags in debian/rules to work like
     dpkg-buildpackage when called directly
+  * Use hardening-includes for CFLAGS and LDFLAGS hardened builds
 
  -- Sven Eckelmann <sven.eckelmann at gmx.de>  Mon, 15 Feb 2010 14:44:27 +0100
 
diff --git a/debian/control b/debian/control
index 6d59b95..90a6862 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ Homepage: http://code.google.com/p/mupen64plus/
 Standards-Version: 3.9.1
 Vcs-Browser: http://git.debian.org/?p=collab-maint/mupen64plus-core.git
 Vcs-Git: git://git.debian.org/git/collab-maint/mupen64plus-core.git
-Build-Depends: debhelper (>= 8.0.0), libfreetype6-dev, libsdl1.2-dev,
- libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
+Build-Depends: debhelper (>= 8.0.0), hardening-includes, libfreetype6-dev,
+ libsdl1.2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
  libpng12-dev | libpng-dev, zlib1g-dev | libz-dev, binutils-dev
 DM-Upload-Allowed: yes
 
diff --git a/debian/rules b/debian/rules
index c28b3d6..40b1df7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,11 @@ export CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
 export CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
 export LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 
+include /usr/share/hardening-includes/hardening.make
+CFLAGS += $(HARDENING_CFLAGS)
+CXXFLAGS += $(HARDENING_CFLAGS)
+LDFLAGS += $(HARDENING_LDFLAGS)
+
 DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 MAKEOPTIONS = V=1 UNAME='$(DEB_HOST_ARCH_OS)' HOST_CPU='$(DEB_HOST_GNU_CPU)' APIDIR=/usr/include/mupen64plus/ DEBUG=1 PREFIX=/usr/ LDCONFIG=true

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-core.git