[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 a9c098828ba60e691fb9dac842eb6e26da40ebbf
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Sat Oct 29 17:55:53 2011 -0400

    it seems cmake needs the build flags set manually (and disable -O3)

diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 6e269a9..65c430e 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -1,8 +1,10 @@
 Description: install binaries to /usr/games and don't install changelog twice
 Author: Michael Gilbert <michael.s.gilbert at gmail.com>
---- minetest-0.2.20110731.3.orig/CMakeLists.txt
-+++ minetest-0.2.20110731.3/CMakeLists.txt
-@@ -58,13 +58,12 @@ elseif(APPLE)
+Index: minetest/CMakeLists.txt
+===================================================================
+--- minetest.orig/CMakeLists.txt	2011-10-29 17:29:52.000000000 -0400
++++ minetest/CMakeLists.txt	2011-10-29 17:34:51.000000000 -0400
+@@ -58,13 +58,12 @@
  	set(EXAMPLE_CONF_DIR ".")
  elseif(UNIX) # Linux, BSD etc
  	set(DATADIR "share/${PROJECT_NAME}")
@@ -17,3 +19,16 @@ Author: Michael Gilbert <michael.s.gilbert at gmail.com>
  install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}")
  
  #
+Index: minetest/src/CMakeLists.txt
+===================================================================
+--- minetest.orig/src/CMakeLists.txt	2011-10-29 17:45:10.000000000 -0400
++++ minetest/src/CMakeLists.txt	2011-10-29 17:45:25.000000000 -0400
+@@ -254,7 +254,7 @@
+ 		set(ARCH i386)
+ 	endif()
+ 
+-	set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops")
++	set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops")
+ 	set(CMAKE_CXX_FLAGS_DEBUG "-g -O1 -Wall ${WARNING_FLAGS}")
+ 
+ 	if(USE_GPROF)
diff --git a/debian/rules b/debian/rules
index bbbcc98..9eec1d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,11 @@
 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)
+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)
 
 override_dh_auto_clean:
 	dh_clean
@@ -38,7 +39,10 @@ override_dh_auto_clean:
 	    data/fontlucida.png
 
 override_dh_auto_configure:
-	cmake -DCMAKE_INCLUDE_PATH=/usr/include/jthread -DCMAKE_INSTALL_PREFIX=/usr .
+	CFLAGS="${CFLAGS}" \
+	    LDFLAGS="${LDFLAGS}" \
+	    CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" \
+	    cmake -DCMAKE_INCLUDE_PATH=/usr/include/jthread -DCMAKE_INSTALL_PREFIX=/usr .
 
 override_dh_auto_build:
 	make VERBOSE=1 ${parallel}

-- 
InfiniMiner/Minecraft-inspired open game world