The following commit has been merged in the master branch:
commit a7fbc33ca67d24a504fe39b658bda770bd06373c
Author: Michael Gilbert <[email protected]>
Date: Sat Apr 21 14:05:45 2012 -0400
use debhelper 9 and simplify build hardening
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 e6216bb..39c6024 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Games Team
<[email protected]>
Uploaders:
Michael Gilbert <[email protected]>
Build-Depends:
- debhelper (>= 8),
+ debhelper (>= 9),
cmake,
libbz2-dev,
imagemagick,
diff --git a/debian/rules b/debian/rules
index 210ffbe..1b8098f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,11 +9,7 @@ wrkdir:=$(shell pwd)
parallel=$(shell echo $$DEB_BUILD_OPTIONS | grep parallel > /dev/null && echo
-j$$(test -f /proc/cpuinfo && cat /proc/cpuinfo | grep ^processor | wc -l ||
echo 1))
# build-hardening flags
-options="+pie,+bindnow"
-CFLAGS=$(shell DEB_BUILD_MAINT_OPTIONS="hardening=${options}" dpkg-buildflags
--get CFLAGS)
-LDFLAGS=$(shell DEB_BUILD_MAINT_OPTIONS="hardening=${options}" dpkg-buildflags
--get LDFLAGS)
-CXXFLAGS=$(shell DEB_BUILD_MAINT_OPTIONS="hardening=${options}"
dpkg-buildflags --get CXXFLAGS)
-CPPFLAGS=$(shell DEB_BUILD_MAINT_OPTIONS="hardening=${options}"
dpkg-buildflags --get CPPFLAGS)
+export DEB_BUILD_MAINT_OPTIONS="hardening=+all"
# file names
sources=$(shell find . -name *.cpp)
--
InfiniMiner/Minecraft-inspired open game world
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
