[Pkg-php-commits] r1226 - php5/trunk/debian

[Sean Finney]

Author: seanius
Date: 2009-01-20 18:10:12 +0000 (Tue, 20 Jan 2009)
New Revision: 1226

Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/rules
Log:
noopt CFLAGS fix

Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2009-01-20 09:33:36 UTC (rev 1225)
+++ php5/trunk/debian/changelog	2009-01-20 18:10:12 UTC (rev 1226)
@@ -3,6 +3,7 @@
   * NOT RELEASED YET
 
   [ Sean Finney ]
+  * Do not add -O2 to CFLAGS if DEB_BUILD_OPTIONS contains noopt.
   * Security related fixes:
     - php: inifile handler for the dba functions can be used to truncate a file
       Patch: dba-inifile-truncation.patch (closes: #507101).

Modified: php5/trunk/debian/rules
===================================================================
--- php5/trunk/debian/rules	2009-01-20 09:33:36 UTC (rev 1225)
+++ php5/trunk/debian/rules	2009-01-20 18:10:12 UTC (rev 1226)
@@ -30,7 +30,10 @@
 export QUILT_DIFF_OPTS QUILT_NO_DIFF_TIMESTAMPS
 
 PROG_SENDMAIL = /usr/sbin/sendmail
-CFLAGS += -O2 -Wall -fsigned-char -fno-strict-aliasing 
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+  CFLAGS += -O2
+endif
+CFLAGS += -Wall -fsigned-char -fno-strict-aliasing 
 # LFS support
 ifneq (yes,$(PHP5_COMPAT))
   CFLAGS += $(shell getconf LFS_CFLAGS)