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

Changes relating to building WebPositive from source.

Browse Source 
* Add WebKit optional package.
 * Make WebKit a dependency of WebPositive
 * Enable building of WebPositive from source.

Note: WebKit currently expands to lib/.  Alternative gcc-subdirectories
are not taken into consideration. Though it is trivial to change.
This commit is contained in:
Matt Madia
2012-07-12 19:45:32 +00:00
parent dada4f4116
commit 29c5696ed7
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalPackageDependencies
+1 -1
View File
@@ -35,7 +35,7 @@ OptionalPackageDependencies SDLLibs : XiphLibs libmad libmikmod Libmng libmodplu
OptionalPackageDependencies Subversion : APR-util Neon LibIconv LibXML2 OpenSSL SQLite ; OptionalPackageDependencies Subversion : APR-util Neon LibIconv LibXML2 OpenSSL SQLite ;
OptionalPackageDependencies Transmission : LibEvent Curl OpenSSL LibIconv ; OptionalPackageDependencies Transmission : LibEvent Curl OpenSSL LibIconv ;
OptionalPackageDependencies Vim : GetText LibIconv ; OptionalPackageDependencies Vim : GetText LibIconv ;
OptionalPackageDependencies WebPositive : Curl LibXML2 SQLite WebPositiveBookmarks ; OptionalPackageDependencies WebPositive : Curl LibXML2 SQLite WebKit WebPositiveBookmarks ;
OptionalPackageDependencies wpa_supplicant : OpenSSL ; OptionalPackageDependencies wpa_supplicant : OpenSSL ;
OptionalPackageDependencies XZ-Utils : Tar ; OptionalPackageDependencies XZ-Utils : Tar ;
build/jam/OptionalPackages
+24 -8
View File
@@ -1843,18 +1843,34 @@ if [ IsOptionalHaikuImagePackageAdded Vision ] {
} }
# WebKit
if [ IsOptionalHaikuImagePackageAdded WebKit ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package WebKit available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) < 4 && ! $(isHybridBuild) {
Echo "No optional package WebKit available for gcc2" ;
} else {
InstallOptionalHaikuImagePackage $(HAIKU_WEBKIT_FILE)
: $(baseURL)/$(HAIKU_WEBKIT_FILE)
: common ;
}
}
# WebPositive # WebPositive
if [ IsOptionalHaikuImagePackageAdded WebPositive ] { if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
if $(TARGET_ARCH) != x86 { if $(TARGET_ARCH) != x86 {
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 && ! $(isHybridBuild) { } else if $(HAIKU_GCC_VERSION[1]) < 4 {
Echo "No optional package WebPositive available for gcc2" ; if ! $(isHybridBuild) {
} else { Echo "No optional package WebPositive available for gcc2" ;
InstallOptionalHaikuImagePackage } else {
WebPositive-gcc4-x86-r586-2012-03-31.zip Echo "WebPositive will be compiled by gcc4 inside $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR)" ;
: $(baseURL)/WebPositive-gcc4-x86-r586-2012-03-31.zip ; }
AddSymlinkToHaikuImage home config settings deskbar Applications } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
: /boot/apps/WebPositive/WebPositive ; AddFilesToHaikuHybridImage apps : WebPositive ;
AddSymlinkToHaikuHybridImage home config settings deskbar Applications
: /boot/apps/WebPositive ;
} }
} }