[haiku-commits] haiku: hrev44292 - build/jam

From: alex@xxxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Wed, 4 Jul 2012 01:50:25 +0200 (CEST)
hrev44292 adds 1 changeset to branch 'master'
old head: 69914905f5fb21097ba8856a119d821f9b6e0693
new head: 8ae2b062a6a39fdbcb41fc6c2f75d30460b5f336

----------------------------------------------------------------------------

8ae2b06: Fix control flow, stop if gcc < 4. Change package URL

                          [ Alexandre Deckner <alexandre.deckner@xxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev44292
Commit:      8ae2b062a6a39fdbcb41fc6c2f75d30460b5f336
URL:         http://cgit.haiku-os.org/haiku/commit/?id=8ae2b06
Author:      Alexandre Deckner <alexandre.deckner@xxxxxxxx>
Date:        Tue Jul  3 23:49:32 2012 UTC

----------------------------------------------------------------------------

1 file changed, 21 insertions(+), 21 deletions(-)
build/jam/OptionalBuildFeatures |   42 +++++++++++++++++------------------

----------------------------------------------------------------------------

diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index 1650242..c29c74f 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -421,34 +421,34 @@ if $(HAIKU_BUILD_FEATURE_TAGLIB) {
 
 
 # WebKit
-local webkitBaseURL = http://dude.uzzl.net/haiku ;
+local webkitBaseURL = http://haiku-files.org/files/optional-packages ;
 if $(TARGET_ARCH) = x86 {
-       if $(HAIKU_GCC_VERSION[1]) >= 4 {
-               HAIKU_WEBKIT_FILE = webkit-0.1.1-x86-gcc4-2012-07-03.zip ;
-       } else {
+       if $(HAIKU_GCC_VERSION[1]) < 4 {
                Echo "WebKit support not available on gcc 
$(HAIKU_GCC_VERSION[1])" ;
-       }
+       } else {
+           HAIKU_WEBKIT_FILE = webkit-0.1.1-x86-gcc4-2012-07-03.zip ;
 
-       local zipFile = [ DownloadFile $(HAIKU_WEBKIT_FILE)
-               : $(webkitBaseURL)/$(HAIKU_WEBKIT_FILE) ] ;
+           local zipFile = [ DownloadFile $(HAIKU_WEBKIT_FILE)
+                   : $(webkitBaseURL)/$(HAIKU_WEBKIT_FILE) ] ;
 
-       HAIKU_WEBKIT_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
-               $(HAIKU_WEBKIT_FILE:B) ] ;
+           HAIKU_WEBKIT_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
+                   $(HAIKU_WEBKIT_FILE:B) ] ;
 
-       HAIKU_WEBKIT_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_WEBKIT_DIR)
-               : include/ : $(zipFile) : extracted-webkit ] ;
+           HAIKU_WEBKIT_HEADERS_DEPENDENCY = [ ExtractArchive 
$(HAIKU_WEBKIT_DIR)
+                   : include/ : $(zipFile) : extracted-webkit ] ;
 
-       HAIKU_WEBKIT_LIBS = [ ExtractArchive $(HAIKU_WEBKIT_DIR)
-               :
-               lib/libwtf.so
-               lib/libjavascriptcore.so
-               lib/libwebcore.so
-               lib/libwebkit.so
-               : $(zipFile)
-               : extracted-webkit
-       ] ;
+           HAIKU_WEBKIT_LIBS = [ ExtractArchive $(HAIKU_WEBKIT_DIR)
+                   :
+                   lib/libwtf.so
+                   lib/libjavascriptcore.so
+                   lib/libwebcore.so
+                   lib/libwebkit.so
+                   : $(zipFile)
+                   : extracted-webkit
+           ] ;
 
-       HAIKU_WEBKIT_HEADERS = [ FDirName $(HAIKU_WEBKIT_DIR) include ] ;
+           HAIKU_WEBKIT_HEADERS = [ FDirName $(HAIKU_WEBKIT_DIR) include ] ;
+    }
 } else {
        Echo "WebKit support not available on $(TARGET_ARCH)" ;
 }
[haiku-commits] haiku: hrev44292 - build/jam

Other related posts:
