[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

laszlo.1.gombos at nokia.com laszlo.1.gombos at nokia.com
Fri Feb 26 22:27:07 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit e280090377eb97e8beb9f53faead122d293aba07
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 22 15:16:36 2010 +0000

    2010-02-22  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Unreviewed build fix.
    
            [Qt] Build fix for RVCT.
    
            Fix after r55024. The "-i" option is for perl not for the
            script.
    
            * DerivedSources.pro:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55083 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 62485e8..3b29766 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-22  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Unreviewed build fix.
+
+        [Qt] Build fix for RVCT.
+
+        Fix after r55024. The "-i" option is for perl not for the
+        script.
+
+        * DerivedSources.pro:
+
 2010-02-21  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/JavaScriptCore/DerivedSources.pro b/JavaScriptCore/DerivedSources.pro
index 28a229d..ac5b51c 100644
--- a/JavaScriptCore/DerivedSources.pro
+++ b/JavaScriptCore/DerivedSources.pro
@@ -78,7 +78,7 @@ addExtraCompiler(jscbison)
 # GENERATOR 3: JIT Stub functions for RVCT
 rvctstubs.output = $${JSC_GENERATED_SOURCES_DIR}$${QMAKE_DIR_SEP}Generated${QMAKE_FILE_BASE}_RVCT.h
 rvctstubs.wkScript = $$PWD/create_jit_stubs
-rvctstubs.commands = perl $$rvctstubs.wkScript --prefix RVCT ${QMAKE_FILE_NAME} -i > ${QMAKE_FILE_OUT}
+rvctstubs.commands = perl -i $$rvctstubs.wkScript --prefix RVCT ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT}
 rvctstubs.depends = ${QMAKE_FILE_NAME}
 rvctstubs.input = RVCT_STUB_FILES
 rvctstubs.CONFIG += no_link

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list