[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[abecsi at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 30f524a673ba2e9b231ecf74d821a42b8f95ea0a
Author: abecsi at webkit.org <abecsi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 20 18:13:55 2011 +0000

    2011-01-20  Andras Becsi  <abecsi at webkit.org>
    
            Reviewed by Csaba Osztrogonác.
    
            [Qt][WK2] WebKit2 enabled build fails to link
    
            Work around undefined reference linking issues until the buildsystem gets redesigned.
            These issues first occured in minimal builds (see BUG 50519).
    
            * JavaScriptCore.pri: link as whole-archive for WebKit2 builds
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76263 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 804f67a..2cc19fe 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-20  Andras Becsi  <abecsi at webkit.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt][WK2] WebKit2 enabled build fails to link
+
+        Work around undefined reference linking issues until the buildsystem gets redesigned.
+        These issues first occured in minimal builds (see BUG 50519).
+
+        * JavaScriptCore.pri: link as whole-archive for WebKit2 builds
+
 2011-01-20  Zoltan Horvath  <zoltan at webkit.org>
 
         Reviewed by Csaba Osztrogonác.
diff --git a/Source/JavaScriptCore/JavaScriptCore.pri b/Source/JavaScriptCore/JavaScriptCore.pri
index a6ddef3..a816c97 100644
--- a/Source/JavaScriptCore/JavaScriptCore.pri
+++ b/Source/JavaScriptCore/JavaScriptCore.pri
@@ -88,7 +88,12 @@ defineTest(addJavaScriptCoreLib) {
         # Make sure jscore will be early in the list of libraries to workaround a bug in MinGW
         # that can't resolve symbols from QtCore if libjscore comes after.
         QMAKE_LIBDIR = $$pathToJavaScriptCoreOutput $$QMAKE_LIBDIR
-        LIBS += -l$$JAVASCRIPTCORE_TARGET
+        webkit2 {
+            # FIXME Workaround for undefined reference linking issues until the build system gets redesigned
+            LIBS += -Wl,-whole-archive -l$$JAVASCRIPTCORE_TARGET -Wl,-no-whole-archive
+        } else {
+            LIBS += -l$$JAVASCRIPTCORE_TARGET
+        }
         POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}lib$${JAVASCRIPTCORE_TARGET}.a
     }
 

-- 
WebKit Debian packaging