[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

hausmann at webkit.org hausmann at webkit.org
Thu Apr 8 01:12:10 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit 5da7d38b4bd446bc4d528aa4fe1b03c84871d6a6
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 18 09:02:18 2010 +0000

    Unreviewed Symbian build fix.
    
    If we don't link with def files, then we have to pass EXPORTUNFROZEN,
    so that the build system still creates the .dso files in
    release/armv5/lib and we can actually link against the created QtWebKit
    dlls.
    
    Thanks Iain for the help!
    
    * WebCore.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53394 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9a3e853..9ed3731 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-18  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Unreviewed Symbian build fix.
+
+        If we don't link with def files, then we have to pass EXPORTUNFROZEN,
+        so that the build system still creates the .dso files in
+        release/armv5/lib and we can actually link against the created QtWebKit
+        dlls.
+
+        Thanks Iain for the help!
+
+        * WebCore.pro:
+
 2010-01-17  Srinidhi Shreedhara  <srinidhi.shreedhara at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index d97f69a..fce4312 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2718,6 +2718,8 @@ symbian {
                     "$${LITERAL_HASH}elif defined EABI" \
                     "DEFFILE ../WebKit/qt/symbian/eabi/$${TARGET}.def" \
                     "$${LITERAL_HASH}endif"
+        } else {
+            MMP_RULES += EXPORTUNFROZEN
         }
     }
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list