From 26fdf3bb3254a741b9978a967f2c50351652d0ee Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Wed, 26 May 2010 17:24:39 +0000 Subject: [PATCH] Updated friss's if statements, to allow installation on a gcc2hybrid. In order to be installed on a GCC 2 Only image, friss would need to be built on gcc2 and provided as a package. Fixes #5962. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36942 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackages | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index b8079cc811..a7a079aed9 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -645,14 +645,14 @@ if [ IsOptionalHaikuImagePackageAdded Expat ] { if [ IsOptionalHaikuImagePackageAdded friss ] { if $(TARGET_ARCH) != x86 { Echo "No optional package friss available for $(TARGET_ARCH)" ; - } else if $(HAIKU_GCC_VERSION[1]) = 2 { - Echo "No optional package friss available for gcc2" ; - } else { + } else if $(HAIKU_GCC_VERSION[1]) >= 4 || $(isHybridBuild) { InstallOptionalHaikuImagePackage friss-0.5pre7-x86-gcc4.zip : http://pulkomandy.ath.cx/projects/friss/export/8/bin/friss-0.5pre7-x86-gcc4.zip : : true ; + } else { + Echo "No optional package friss available for gcc2" ; } } @@ -1358,14 +1358,14 @@ if [ IsOptionalHaikuImagePackageAdded Vision ] { } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage Vision-0.9.7-H-x86-gcc4-2010-05-22.zip : $(baseURL)/Vision-0.9.7-H-x86-gcc4-2010-05-22.zip - : + : ; AddSymlinkToHaikuImage home config be Applications : /boot/apps/Vision-0.9.7-H-090423/Vision ; } else { InstallOptionalHaikuImagePackage Vision-0.9.7-H-x86-gcc2-2010-05-22.zip : $(baseURL)/Vision-0.9.7-H-x86-gcc2-2010-05-22.zip - : + : ; AddSymlinkToHaikuImage home config be Applications : /boot/apps/Vision-0.9.7-H-090423/Vision ;