r10285 - packages/trunk/cookietool/debian

[Peter Pentchev]

Author: roam-guest
Date: 2009-09-06 22:41:59 +0000 (Sun, 06 Sep 2009)
New Revision: 10285

Modified:
   packages/trunk/cookietool/debian/changelog
   packages/trunk/cookietool/debian/rules
Log:
Disable the hardening wrapper by default, only enable it if "hardening"
is in DEB_BUILD_OPTIONS.  This should actually create a working executable
on the mips and mipsel architectures (see binutils bug #526961).


Modified: packages/trunk/cookietool/debian/changelog
===================================================================
--- packages/trunk/cookietool/debian/changelog	2009-09-06 22:36:39 UTC (rev 10284)
+++ packages/trunk/cookietool/debian/changelog	2009-09-06 22:41:59 UTC (rev 10285)
@@ -9,6 +9,8 @@
   * Add the Vcs-Svn and Vcs-Browser control fields.
   * Switch the copyright file to the rev. 59 of DEP 5 and shorten it by
     breaking out the repeated GPL-2+ license text into a separate section.
+  * Only enable the hardening wrapper if "hardening" is specified in
+    DEB_BUILD_OPTIONS.
 
  -- Peter Pentchev <roam at ringlet.net>  Mon, 17 Aug 2009 18:10:41 +0300
 

Modified: packages/trunk/cookietool/debian/rules
===================================================================
--- packages/trunk/cookietool/debian/rules	2009-09-06 22:36:39 UTC (rev 10284)
+++ packages/trunk/cookietool/debian/rules	2009-09-06 22:41:59 UTC (rev 10285)
@@ -9,7 +9,7 @@
 	CFLAGS+=	-Werror
 endif
 export CFLAGS
-ifeq (,$(filter nohardening,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter hardening,$(DEB_BUILD_OPTIONS)))
 export DEB_BUILD_HARDENING=1
 else
 export DEB_BUILD_HARDENING=0