Ticket #8713: 0001-Changes-relating-to-building-WebPositive-from-source.patch

File 0001-Changes-relating-to-building-WebPositive-from-source.patch, 2.3 KB (added by mmadia, 12 years ago)

  • build/jam/OptionalBuildFeatures 

    From f399d4f81fb1de7a7e5cc12b85e8b90b730685fb Mon Sep 17 00:00:00 2001
From: Matt Madia <mattmadia@gmail.com>
Date: Tue, 10 Jul 2012 19:16:46 +0000
Subject: [PATCH 1/2] Changes relating to building WebPositive from source.

 * Detect hybrid builds.
 * Only enable WebKit build feature when WebPositive is added
 * Provide a more accurate message for gcc2hybrids.
---
 build/jam/OptionalBuildFeatures |   29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index 17bf698..64be3b3 100644
    a b  
    22# build. For features that require downloading a zip file from somewhere it is
    33# likely the same file use for an optional package.
    44
     5# Detect a hybrid GCC2/GCC4 image and disable the checks for unavailable GCC4
     6# packages. (It does not matter if a package was built with either compiler,
     7# the system should have the respective other system libs.)
     8local isHybridBuild ;
     9if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
     10        && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
     11    isHybridBuild = 1 ;
     12}
    513
    614local baseURL = http://www.haiku-files.org/files/optional-packages ;
    715
    … … if $(HAIKU_BUILD_FEATURE_TAGLIB) {  
    421429
    422430
    423431# WebKit
     432# Automatically install the WebKit feature, when the optional WebPositive
     433# optional package is enabled.
     434if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
     435    HAIKU_BUILD_FEATURE_WEBKIT = 1 ;
     436}
     437
    424438HAIKU_WEBKIT_FILE = webkit-0.1.1-x86-gcc4-2012-07-03.zip ;
    425 if $(TARGET_ARCH) = x86 {
    426     if $(HAIKU_GCC_VERSION[1]) < 4 {
    427         Echo "WebKit support not available on gcc $(HAIKU_GCC_VERSION[1])" ;
     439
     440if $(HAIKU_BUILD_FEATURE_WEBKIT) {
     441    if $(TARGET_ARCH) != x86 {
     442        Echo "WebKit support not available on $(TARGET_ARCH)" ;
     443    } else if $(HAIKU_GCC_VERSION[1]) < 4 {
     444        if ! $(isHybridBuild) {
     445            Echo "WebKit support not available on gcc $(HAIKU_GCC_VERSION[1])" ;
     446        } else {
     447            Echo "WebKit to be utilized by gcc4 inside $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR)" ;
     448        }
    428449    } else {
    429450        local zipFile = [ DownloadFile $(HAIKU_WEBKIT_FILE)
    430451            : $(baseURL)/$(HAIKU_WEBKIT_FILE) ] ;
    … … if $(TARGET_ARCH) = x86 {  
    447468
    448469        HAIKU_WEBKIT_HEADERS = [ FDirName $(HAIKU_WEBKIT_DIR) include ] ;
    449470    }
    450 } else {
    451     Echo "WebKit support not available on $(TARGET_ARCH)" ;
    452471}