i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated friss's if statements, to allow installation on a gcc2hybrid. In order

Browse Source 
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
This commit is contained in:
Matt Madia
2010-05-26 17:24:39 +00:00
parent d7e91d9253
commit 26fdf3bb32
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalPackages
+5 -5
View File
@@ -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 ;