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

BuildFeatures: re-add webkit build feature

Browse Source
This commit is contained in:
Ingo Weinhold
2013-08-10 15:05:51 +02:00
parent 2910d9a7e0
commit 1c9bc20646
1 changed files with 16 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildFeatures
+15 -50
View File
@@ -373,59 +373,24 @@ if $(HAIKU_BUILD_FEATURE_TAGLIB) {
# WebKit # WebKit
if [ IsPackageAvailable haikuwebkit_devel ] {
# TODO: Update to packages! ExtractBuildFeatureArchives webkit :
if ! 1 { file: base haikuwebkit
runtime: lib
# Automatically install the WebKit feature, when the optional WebPositive file: devel haikuwebkit_devel
# optional package is enabled. depends: base
if [ IsOptionalHaikuImagePackageAdded WebPositive ] { libraries:
HAIKU_BUILD_FEATURE_WEBKIT = 1 ; $(developLibDir)/libwtf.so
} $(developLibDir)/libjavascriptcore.so
$(developLibDir)/libwebcore.so
if $(TARGET_ARCH) = x86 { $(developLibDir)/libwebkit.so
HAIKU_WEBKIT_FILE = haikuwebkit-1.1.3-x86-gcc4-2012-08-31a.zip ; headers: $(developHeadersDir)
} else if $(TARGET_ARCH) = x86_64 { ;
HAIKU_WEBKIT_FILE = haikuwebkit-1.1.3-x86_64-gcc4-2012-12-22.zip ;
}
if $(HAIKU_BUILD_FEATURE_WEBKIT) {
if $(TARGET_ARCH) != x86 && $(TARGET_ARCH) != x86_64 {
Echo "WebKit support not available on $(TARGET_ARCH)" ;
} else if $(TARGET_GCC_VERSION_$(architecture)[1]) < 4 {
if ! $(isHybridBuild) {
Echo "WebKit support not available on gcc"
"$(TARGET_GCC_VERSION_$(architecture)[1])" ;
} else {
Echo "WebKit to be utilized by gcc4 inside"
"$(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR)" ;
}
} else {
local zipFile = [ DownloadFile $(HAIKU_WEBKIT_FILE)
: $(baseURL)/$(HAIKU_WEBKIT_FILE) ] ;
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_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 ] ;
EnableBuildFeatures webkit ; EnableBuildFeatures webkit ;
} else {
Echo "WebKit build feature not available for $(TARGET_PACKAGING_ARCH)" ;
} }
}
} # ! 1
# libpng # libpng