[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[demarchi at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 620dc9cc967ac3920dacef3337809cb0baf0502f
Author: demarchi at webkit.org <demarchi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 23 01:18:10 2010 +0000

    2010-09-22  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
    
            Reviewed by Antonio Gomes.
    
            [EFL] Fix build with GCC 4.4.x
            https://bugs.webkit.org/show_bug.cgi?id=40826
    
            Change the -fstrict-aliasing flag to -fno-strict-aliasing as other
            ports like GTK and QT are using in their build systems. It was failing
            to execute when compiled with GCC 4.4.x in Release mode.
    
            Refactor the flags in order to be more readable.
    
            * cmake/WebKitHelpers.cmake:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68106 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 75f63f0..8d9d658 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-22  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Fix build with GCC 4.4.x
+        https://bugs.webkit.org/show_bug.cgi?id=40826
+
+        Change the -fstrict-aliasing flag to -fno-strict-aliasing as other
+        ports like GTK and QT are using in their build systems. It was failing
+        to execute when compiled with GCC 4.4.x in Release mode.
+
+        Refactor the flags in order to be more readable.
+
+        * cmake/WebKitHelpers.cmake:
+
 2010-09-22  No'am Rosenthal  <noam.rosenthal at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/cmake/WebKitHelpers.cmake b/cmake/WebKitHelpers.cmake
index 1e69d49..34c395a 100644
--- a/cmake/WebKitHelpers.cmake
+++ b/cmake/WebKitHelpers.cmake
@@ -14,13 +14,15 @@ MACRO(WEBKIT_SET_EXTRA_COMPILER_FLAGS _target)
         SET(OLD_COMPILE_FLAGS "${OLD_COMPILE_FLAGS} -fno-tree-sra")
     ENDIF ()
 
-    IF (SHARED_CORE)
-        SET_TARGET_PROPERTIES (${_target} PROPERTIES
-            COMPILE_FLAGS "-fno-exceptions -fstrict-aliasing ${OLD_COMPILE_FLAGS}")
-    ELSE ()
-        SET_TARGET_PROPERTIES (${_target} PROPERTIES
-            COMPILE_FLAGS "-fPIC -fno-exceptions -fstrict-aliasing -fvisibility=hidden ${OLD_COMPILE_FLAGS}")
+    IF (NOT SHARED_CORE)
+        SET(OLD_COMPILE_FLAGS "-fPIC -fvisibility=hidden ${OLD_COMPILE_FLAGS}")
     ENDIF ()
+
+    SET(OLD_COMPILE_FLAGS "-fno-exceptions -fno-strict-aliasing ${OLD_COMPILE_FLAGS}")
+
+    SET_TARGET_PROPERTIES (${_target} PROPERTIES
+	COMPILE_FLAGS "${OLD_COMPILE_FLAGS}")
+
     UNSET(OLD_COMPILE_FLAGS)
   ENDIF ()
 ENDMACRO()

-- 
WebKit Debian packaging