i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexandre Deckner
2012-07-04 01:49:32 +02:00
parent 69914905f5
commit 8ae2b062a6
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalBuildFeatures
+21 -21
View File
@@ -421,34 +421,34 @@ if $(HAIKU_BUILD_FEATURE_TAGLIB) {
# WebKit # WebKit
local webkitBaseURL = http://dude.uzzl.net/haiku ; local webkitBaseURL = http://haiku-files.org/files/optional-packages ;
if $(TARGET_ARCH) = x86 { if $(TARGET_ARCH) = x86 {
if $(HAIKU_GCC_VERSION[1]) >= 4 { if $(HAIKU_GCC_VERSION[1]) < 4 {
HAIKU_WEBKIT_FILE = webkit-0.1.1-x86-gcc4-2012-07-03.zip ;
} else {
Echo "WebKit support not available on gcc $(HAIKU_GCC_VERSION[1])" ; 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) local zipFile = [ DownloadFile $(HAIKU_WEBKIT_FILE)
: $(webkitBaseURL)/$(HAIKU_WEBKIT_FILE) ] ; : $(webkitBaseURL)/$(HAIKU_WEBKIT_FILE) ] ;
HAIKU_WEBKIT_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR) HAIKU_WEBKIT_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
$(HAIKU_WEBKIT_FILE:B) ] ; $(HAIKU_WEBKIT_FILE:B) ] ;
HAIKU_WEBKIT_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_WEBKIT_DIR) HAIKU_WEBKIT_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_WEBKIT_DIR)
: include/ : $(zipFile) : extracted-webkit ] ; : include/ : $(zipFile) : extracted-webkit ] ;
HAIKU_WEBKIT_LIBS = [ ExtractArchive $(HAIKU_WEBKIT_DIR) HAIKU_WEBKIT_LIBS = [ ExtractArchive $(HAIKU_WEBKIT_DIR)
: :
lib/libwtf.so lib/libwtf.so
lib/libjavascriptcore.so lib/libjavascriptcore.so
lib/libwebcore.so lib/libwebcore.so
lib/libwebkit.so lib/libwebkit.so
: $(zipFile) : $(zipFile)
: extracted-webkit : extracted-webkit
] ; ] ;
HAIKU_WEBKIT_HEADERS = [ FDirName $(HAIKU_WEBKIT_DIR) include ] ; HAIKU_WEBKIT_HEADERS = [ FDirName $(HAIKU_WEBKIT_DIR) include ] ;
}
} else { } else {
Echo "WebKit support not available on $(TARGET_ARCH)" ; Echo "WebKit support not available on $(TARGET_ARCH)" ;
} }