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

andreas.kling at nokia.com andreas.kling at nokia.com
Wed Dec 22 15:54:17 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 6fe21fce4d1c4f98b55f6d8c4ad1ecbdf702afef
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 16 12:46:07 2010 +0000

    2010-11-16  Andreas Kling  <kling at webkit.org>
    
            Unreviewed typo fix for previous commit.
    
            * common.pri:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72085 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index d2667de..f54d519 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-11-16  Andreas Kling  <kling at webkit.org>
 
+        Unreviewed typo fix for previous commit.
+
+        * common.pri:
+
+2010-11-16  Andreas Kling  <kling at webkit.org>
+
         Reviewed by Kenneth Rohde Christiansen.
 
         [Qt][Scratchbox] Use gold linker explicitly when available
diff --git a/common.pri b/common.pri
index aa6b8e7..c9843bb 100644
--- a/common.pri
+++ b/common.pri
@@ -4,7 +4,7 @@ contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
 contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
 
 linux-g++ {
-isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
+!isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
     message(Using gold linker)
     QMAKE_CFLAGS+=-fuse-ld=gold
     QMAKE_CXXFLAGS+=-fuse-ld=gold

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list