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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 1e08e612d74c716d3eff84dce4048d64a47be7fb
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 3 05:41:27 2010 +0000

    2010-09-02  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
    
            Reviewed by Antonio Gomes.
    
            [EFL] Fix double addition of -fPIC
            https://bugs.webkit.org/show_bug.cgi?id=45122
    
             When SHARED_CORE=ON, -fPIC is automatically added because all
             libraries are dynamic. Only when static libraries are built that
             -fPIC needs to be manually inserted (because the final library,
             libewebkit.so, is dynamic).
    
            * cmake/OptionsCommon.cmake: Remove -fPIC flag.
            * cmake/WebKitHelpers.cmake: Add -fPIC flags iff SHARED_CORE=ON.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66714 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index c75cc87..3af1bfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-02  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Fix double addition of -fPIC
+        https://bugs.webkit.org/show_bug.cgi?id=45122
+
+         When SHARED_CORE=ON, -fPIC is automatically added because all
+         libraries are dynamic. Only when static libraries are built that
+         -fPIC needs to be manually inserted (because the final library,
+         libewebkit.so, is dynamic).
+
+        * cmake/OptionsCommon.cmake: Remove -fPIC flag.
+        * cmake/WebKitHelpers.cmake: Add -fPIC flags iff SHARED_CORE=ON.
+
 2010-09-01  Ryuan Choi  <ryuan.choi at samsung.com>
 
         Reviewed by Antonio Gomes.
diff --git a/cmake/OptionsCommon.cmake b/cmake/OptionsCommon.cmake
index 8b0b9c3..3235816 100644
--- a/cmake/OptionsCommon.cmake
+++ b/cmake/OptionsCommon.cmake
@@ -1,11 +1,6 @@
 ADD_DEFINITIONS(-DBUILDING_WITH_CMAKE=1)
 ADD_DEFINITIONS(-DHAVE_CONFIG_H=1)
 
-IF (CMAKE_COMPILER_IS_GNUCC)
-    SET(CMAKE_CXX_FLAGS "-fPIC ${CMAKE_CXX_FLAGS}")
-    SET(CMAKE_C_FLAGS "-fPIC ${CMAKE_C_FLAGS}")
-ENDIF ()
-
 SET(WTF_INCLUDE_DIRECTORIES
     "${JAVASCRIPTCORE_DIR}"
     "${JAVASCRIPTCORE_DIR}/wtf"
diff --git a/cmake/WebKitHelpers.cmake b/cmake/WebKitHelpers.cmake
index 55549d6..1e69d49 100644
--- a/cmake/WebKitHelpers.cmake
+++ b/cmake/WebKitHelpers.cmake
@@ -19,7 +19,7 @@ MACRO(WEBKIT_SET_EXTRA_COMPILER_FLAGS _target)
             COMPILE_FLAGS "-fno-exceptions -fstrict-aliasing ${OLD_COMPILE_FLAGS}")
     ELSE ()
         SET_TARGET_PROPERTIES (${_target} PROPERTIES
-            COMPILE_FLAGS "-fno-exceptions -fstrict-aliasing -fvisibility=hidden ${OLD_COMPILE_FLAGS}")
+            COMPILE_FLAGS "-fPIC -fno-exceptions -fstrict-aliasing -fvisibility=hidden ${OLD_COMPILE_FLAGS}")
     ENDIF ()
     UNSET(OLD_COMPILE_FLAGS)
   ENDIF ()

-- 
WebKit Debian packaging