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

Add x86-64 WebKit package. Makes Web+ available on x86-64.

Browse Source
This commit is contained in:
Rene Gollent
2012-12-22 16:24:16 -05:00
parent 523a87a5d2
commit 4fd9bbbc8d
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildFeatures
+6 -3
View File
@@ -545,10 +545,13 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
HAIKU_BUILD_FEATURE_WEBKIT = 1 ; HAIKU_BUILD_FEATURE_WEBKIT = 1 ;
} }
HAIKU_WEBKIT_FILE = haikuwebkit-1.1.3-x86-gcc4-2012-08-31a.zip ; if $(TARGET_ARCH) = x86 {
HAIKU_WEBKIT_FILE = haikuwebkit-1.1.3-x86-gcc4-2012-08-31a.zip ;
} 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 $(HAIKU_BUILD_FEATURE_WEBKIT) {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 && $(TARGET_ARCH) != x86_64 {
Echo "WebKit support not available on $(TARGET_ARCH)" ; Echo "WebKit support not available on $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) < 4 { } else if $(HAIKU_GCC_VERSION[1]) < 4 {
if ! $(isHybridBuild) { if ! $(isHybridBuild) {
build/jam/OptionalPackages
+1 -1
View File
@@ -2157,7 +2157,7 @@ if [ IsOptionalHaikuImagePackageAdded WebKit ] {
# WebPositive # WebPositive
if [ IsOptionalHaikuImagePackageAdded WebPositive ] { if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 && $(TARGET_ARCH) != x86_64 {
Echo "No optional package WebPositive available for $(TARGET_ARCH)" ; Echo "No optional package WebPositive available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) < 4 { } else if $(HAIKU_GCC_VERSION[1]) < 4 {
if ! $(isHybridBuild) { if ! $(isHybridBuild) {