* reverted r33019-33021, as the patch was only meant for the alpha-branch,

sorry for all the noise!


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33024 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe 2009-09-09 13:42:22 +00:00
parent 86e43ff70c
commit 30fd88d297
2 changed files with 12 additions and 6 deletions

View File

@ -8,6 +8,7 @@ OptionalPackageDependencies APR-util : APR Expat ;
OptionalPackageDependencies BeHappy : BeBook NetSurf ;
OptionalPackageDependencies Development : DevelopmentBase Perl ;
OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
OptionalPackageDependencies Firefox : LibIconv ;
OptionalPackageDependencies LibLayout : DevelopmentBase ;
OptionalPackageDependencies NetSurf : OpenSSL ;
OptionalPackageDependencies OpenSSH : OpenSSL ;

View File

@ -445,13 +445,18 @@ if [ IsOptionalHaikuImagePackageAdded Expat ] {
if [ IsOptionalHaikuImagePackageAdded Firefox ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package Firefox available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
Echo "No optional package Firefox available for gcc4" ;
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
InstallOptionalHaikuImagePackage
BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01
: $(baseURL)/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip
: apps
;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BeZillaBrowser/BeZillaBrowser ;
} else {
InstallOptionalHaikuImagePackage
BeZillaBrowser-2.0.0.22pre-r1a1-x86-gcc2-2009-09-08
: $(baseURL)/BeZillaBrowser-2.0.0.22pre-r1a1-x86-gcc2-2009-09-08.zip
:
InstallOptionalHaikuImagePackage BeZillaBrowser-gcc2-20090218
: http://bezilla.beuser.de/builds/BeZillaBrowser-gcc2-20090218.zip
: apps
;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/BeZillaBrowser/BeZillaBrowser ;