From 102e196b9315efb6b87adc283be3857dbc78afbc Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 5 Aug 2009 14:28:58 +0000 Subject: [PATCH] Reenabled Firefox gcc 4 package. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32133 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackages | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index bc609e960f..bd4a2e03b3 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -398,17 +398,14 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 { if [ IsOptionalHaikuImagePackageAdded Firefox ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Firefox available for $(TARGET_ARCH)" ; -# TODO: Update BeZilla GCC4 build, this one is currently broken, because of -# the BToolTip addition. At least the GCC2 build will work just fine on hybrid -# installations. -# } 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 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 if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { Echo "No optional package Firefox available for GCC4" ; } else {