From 30fd88d297937a32730995d840c995de4db61fad Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Wed, 9 Sep 2009 13:42:22 +0000 Subject: [PATCH] * 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 --- build/jam/OptionalPackageDependencies | 1 + build/jam/OptionalPackages | 17 +++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies index ed1b554e82..38a3db0ce2 100644 --- a/build/jam/OptionalPackageDependencies +++ b/build/jam/OptionalPackageDependencies @@ -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 ; diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index ca4b865c35..e2d23257b6 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -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 ;