[SCM] InfiniMiner/Minecraft-inspired open game world branch, master, updated. upstream/0.2.20110731.3-21-g1eb4088

[Michael Gilbert]

The following commit has been merged in the master branch:
commit 1e3a43f24669b9739e69089f4e07652691377fe7
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Sat Oct 29 16:00:27 2011 -0400

    enable all build-hardening flags

diff --git a/debian/changelog b/debian/changelog
index b528195..1056db9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ minetest (0.2.20110922.3-1) UNRELEASED; urgency=low
   * Disable DM-Upload-Allowed.
   * Add some more copyright info.
   * Remove embedded sqlite code copy.
+  * Enable all build-hardening flags.
   * Use system jthread library.
   * Fix dep5 url format.
 
diff --git a/debian/rules b/debian/rules
index b429feb..bbbcc98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,14 @@
 #!/usr/bin/make -f
+
+# parallel building
 parallel=$(shell echo $$DEB_BUILD_OPTIONS | grep parallel > /dev/null && echo -j$$(test -f /proc/cpuinfo && cat /proc/cpuinfo | grep processor | grep processor | wc -l || echo 1))
 
+# build-hardening flags
+CFLAGS=$(shell DEB_BUILD_MAINT_OPTIONS="hardening=+pie,+bindnow" dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell DEB_BUILD_MAINT_OPTIONS="hardening=+pie,+bindnow" dpkg-buildflags --get LDFLAGS)
+CXXFLAGS=$(shell DEB_BUILD_MAINT_OPTIONS="hardening=+pie,+bindnow" dpkg-buildflags --get CXXFLAGS)
+CPPFLAGS=$(shell DEB_BUILD_MAINT_OPTIONS="hardening=+pie,+bindnow" dpkg-buildflags --get CPPFLAGS)
+
 override_dh_auto_clean:
 	dh_clean
 	rm -rf bin \
@@ -30,7 +38,6 @@ override_dh_auto_clean:
 	    data/fontlucida.png
 
 override_dh_auto_configure:
-	#CMAKE_INCLUDE_PATH=/usr/include/jthread cmake -DCMAKE_INSTALL_PREFIX=/usr .
 	cmake -DCMAKE_INCLUDE_PATH=/usr/include/jthread -DCMAKE_INSTALL_PREFIX=/usr .
 
 override_dh_auto_build:

-- 
InfiniMiner/Minecraft-inspired open game world