r13540 - in packages/trunk/yabause/debian: . patches

[Evgeni Golov]

Author: evgeni
Date: 2012-05-05 14:19:12 +0000 (Sat, 05 May 2012)
New Revision: 13540

Added:
   packages/trunk/yabause/debian/patches/
   packages/trunk/yabause/debian/patches/series
   packages/trunk/yabause/debian/patches/use_dpkg_buildflags.patch
Modified:
   packages/trunk/yabause/debian/changelog
   packages/trunk/yabause/debian/rules
Log:
Properly enable hardening flags.

Thanks: Simon Ruderich <simon at ruderich.org>
Closes: #662969
Added patch: use_dpkg_buildflags.patch



Modified: packages/trunk/yabause/debian/changelog
===================================================================
--- packages/trunk/yabause/debian/changelog	2012-05-04 22:44:26 UTC (rev 13539)
+++ packages/trunk/yabause/debian/changelog	2012-05-05 14:19:12 UTC (rev 13540)
@@ -3,8 +3,12 @@
   * New upstream bugfix release.
   * Drop all patches, they were either taken from upstream SVN or
     were applied upstream in this release.
+  * Properly enable hardening flags.
+    Thanks: Simon Ruderich <simon at ruderich.org>
+    Closes: #662969
+    Added patch: use_dpkg_buildflags.patch
 
- -- Evgeni Golov <evgeni at debian.org>  Tue, 01 May 2012 18:11:57 +0200
+ -- Evgeni Golov <evgeni at debian.org>  Tue, 01 May 2012 18:31:32 +0200
 
 yabause (0.9.11-1) unstable; urgency=low
 

Added: packages/trunk/yabause/debian/patches/series
===================================================================
--- packages/trunk/yabause/debian/patches/series	                        (rev 0)
+++ packages/trunk/yabause/debian/patches/series	2012-05-05 14:19:12 UTC (rev 13540)
@@ -0,0 +1 @@
+use_dpkg_buildflags.patch

Added: packages/trunk/yabause/debian/patches/use_dpkg_buildflags.patch
===================================================================
--- packages/trunk/yabause/debian/patches/use_dpkg_buildflags.patch	                        (rev 0)
+++ packages/trunk/yabause/debian/patches/use_dpkg_buildflags.patch	2012-05-05 14:19:12 UTC (rev 13540)
@@ -0,0 +1,34 @@
+Description: Use build flags from environment (dpkg-buildflags).
+Author: Simon Ruderich <simon at ruderich.org>
+Last-Update: 2012-03-07
+
+--- yabause-0.9.11.orig/src/CMakeLists.txt
++++ yabause-0.9.11/src/CMakeLists.txt
+@@ -324,13 +324,13 @@
+ endif ()
+ 
+ if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
+-	set(CMAKE_C_FLAGS "-O3 -march=i686 -msse")
++	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -march=i686 -msse")
+ endif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
+ if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
+-	set(CMAKE_C_FLAGS "-O3")
++	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
+ endif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
+ if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7l")
+-	set(CMAKE_C_FLAGS "-O3 -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=softfp")
++	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -mcpu=cortex-a8 -mfpu=vfp -mfloat-abi=softfp")
+ endif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv7l")
+ 
+ add_definitions(-DPACKAGE=\"${YAB_PACKAGE}\")
+--- yabause-0.9.11.orig/autopackage/default.apspec.in
++++ yabause-0.9.11/autopackage/default.apspec.in
+@@ -34,7 +34,7 @@ AutopackageTarget: 1.0
+ This is a Sega Saturn emulator.
+ 
+ [BuildPrepare]
+-prepareBuild --enable-static-mini18n CFLAGS='-D_FORTIFY_SOURCE=0'
++prepareBuild --enable-static-mini18n
+ 
+ [BuildUnprepare]
+ unprepareBuild

Modified: packages/trunk/yabause/debian/rules
===================================================================
--- packages/trunk/yabause/debian/rules	2012-05-04 22:44:26 UTC (rev 13539)
+++ packages/trunk/yabause/debian/rules	2012-05-05 14:19:12 UTC (rev 13540)
@@ -1,9 +1,13 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-export LDFLAGS
+# CMake doesn't use CPPFLAGS, pass them to CFLAGS/CXXFLAGS to enable the
+# missing (hardening) flags.
+export DEB_CFLAGS_MAINT_APPEND   = $(shell dpkg-buildflags --get CPPFLAGS)
+export DEB_CXXFLAGS_MAINT_APPEND = $(shell dpkg-buildflags --get CPPFLAGS)
 
+export DEB_LDFLAGS_MAINT_APPEND  = -Wl,-z,defs -Wl,--as-needed
+
 %:
 	dh $@