[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

paroga at webkit.org paroga at webkit.org
Fri Jan 21 14:53:37 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit cf59fe065aa59063763f82104c59c25849af1431
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 3 21:42:34 2011 +0000

    2011-01-03  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by Darin Adler.
    
            [WINCE] Provide third party directory via environment variable
            https://bugs.webkit.org/show_bug.cgi?id=51643
    
            * Source/cmake/OptionsWinCE.cmake:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74938 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index b0d9f75..cd72bd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-03  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        [WINCE] Provide third party directory via environment variable
+        https://bugs.webkit.org/show_bug.cgi?id=51643
+
+        * Source/cmake/OptionsWinCE.cmake:
+
 2011-01-03  Xan Lopez  <xlopez at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/Source/cmake/OptionsWinCE.cmake b/Source/cmake/OptionsWinCE.cmake
index 7884530..55f8caa 100644
--- a/Source/cmake/OptionsWinCE.cmake
+++ b/Source/cmake/OptionsWinCE.cmake
@@ -10,7 +10,11 @@ ADD_DEFINITIONS(-DUSE_SYSTEM_MALLOC=1)
 ADD_DEFINITIONS(-DJSCCOLLECTOR_VIRTUALMEM_RESERVATION=0x200000)
 
 IF (NOT 3RDPARTY_DIR)
-    MESSAGE(FATAL_ERROR "You must provide a 3rd party directory for WinCE port.")
+    IF (EXISTS $ENV{WEBKITTHIRDPARTYDIR})
+        SET(3RDPARTY_DIR $ENV{WEBKITTHIRDPARTYDIR})
+    ELSE ()
+        MESSAGE(FATAL_ERROR "You must provide a third party directory for WinCE port.")
+    ENDIF ()
 ENDIF ()
 
 INCLUDE_DIRECTORIES(${3RDPARTY_DIR}/ce-compat)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list