[SCM] WebKit Debian packaging branch, debian, updated. 0+svn25144-2-1-g638f5ec

[Mike Hommey]

The branch, debian has been updated
       via  638f5ecacdf5d7037883f888eec9529f91e3f777 (commit)
      from  f620c87e159dda1c7af119af240131c8fd946ff0 (commit)


- Shortlog ------------------------------------------------------------
638f5ec Add support for DEB_BUILD_OPTIONS=noopt.

Summary of changes:
 debian/changelog |    6 ++++++
 debian/rules     |   16 ++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 638f5ecacdf5d7037883f888eec9529f91e3f777
Author: Mike Hommey <glandium at debian.org>
Date:   Thu Sep 13 20:42:44 2007 +0200

    Add support for DEB_BUILD_OPTIONS=noopt.

diff --git a/debian/changelog b/debian/changelog
index bbf7bc4..e8266a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+webkit (0~svn25144-3) UNRELEASED; urgency=low
+
+  * debian/rules: Add support for DEB_BUILD_OPTIONS=noopt.
+
+ -- Mike Hommey <glandium at debian.org>  Thu, 13 Sep 2007 20:42:05 +0200
+
 webkit (0~svn25144-2) unstable; urgency=low
 
   * JavaScriptCore/wtf/Platform.h:
diff --git a/debian/rules b/debian/rules
index 75f88ec..ddd3cd4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,14 @@
 QMAKE=qmake-qt4
 SO_VERSION=0d
 
+CFLAGS = -g -Wall
+
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+        CFLAGS += -O2
+else
+        CFLAGS += -O0
+endif
+
 clean-gdk:
 	dh_testdir
 	dh_testroot
@@ -37,8 +45,8 @@ build-gdk-stamp:
 		OUTPUT_DIR="$(CURDIR)"/build-gdk \
 		QMAKE_STRIP=/bin/true \
 		QMAKE_RPATH= \
-		QMAKE_CFLAGS="-g -O2 -Wall" \
-		QMAKE_CXXFLAGS="-g -O2 -Wall" \
+		QMAKE_CFLAGS="$(CFLAGS)" \
+		QMAKE_CXXFLAGS="$(CFLAGS)" \
 		QMAKE_LFLAGS="-Wl,--as-needed" \
 		VERSION=$(SO_VERSION) \
 		CONFIG-=qt CONFIG+=gdk-port \
@@ -61,8 +69,8 @@ build-qt-stamp:
 		OUTPUT_DIR="$(CURDIR)"/build-qt \
 		QMAKE_STRIP=/bin/true \
 		QMAKE_RPATH= \
-		QMAKE_CFLAGS="-g -O2 -Wall" \
-		QMAKE_CXXFLAGS="-g -O2 -Wall" \
+		QMAKE_CFLAGS="$(CFLAGS)" \
+		QMAKE_CXXFLAGS="$(CFLAGS)" \
 		QMAKE_LFLAGS="-Wl,--as-needed" \
 		VERSION=$(SO_VERSION) \
 		CONFIG+=qt-port \

-- 
WebKit Debian packaging