Ticket #4036: OptionalPackages.diff

build/jam/OptionalPackages

@@ -399 +399 @@
 if [ IsOptionalHaikuImagePackageAdded Firefox ] {
     if $(TARGET_ARCH) != x86 {
         Echo "No optional package Firefox available for $(TARGET_ARCH)" ;
-    } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+    } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
         local baseURL = http://haiku-files.org/files/optional-packages ;
         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
@@ -424 +424 @@
 if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
     if $(TARGET_ARCH) != x86 {
         Echo "No optional package KeymapSwitcher available for $(TARGET_ARCH)" ;
-    } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+    } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
         local baseURL = http://downloads.sourceforge.net/dotmatrix4beos ;
         InstallOptionalHaikuImagePackage KeymapSwitcher-gcc4-20090531
             :  $(baseURL)/KeymapSwitcher-1.2.3-gcc4-2009-05-31.zip
@@ -792 +792 @@
 if [ IsOptionalHaikuImagePackageAdded Vim ] {
     if $(TARGET_ARCH) != x86 {
         Echo "No optional package Vim available for $(TARGET_ARCH)" ;
-    } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+    } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
         local baseURL = http://haiku-ports.de/packages/app-editors/vim ;
         InstallOptionalHaikuImagePackage vim-7.2-gcc4-20090531
             :  $(baseURL)/vim-7.2-gcc4-haiku-2009-05-31.zip