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

applied patch by Maurice Kalinowski:

Browse Source 
Do not attempt to install optional 3rd party packages when building
a GCC4 version of Haiku. I think there has been some discussion on this
topic before, with a more advanced solution, but for the time being, this
should be ok.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24087 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2008-02-24 09:43:10 +00:00
parent 24c53891f1
commit 18c361960a
1 changed files with 50 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+50 -30
View File
@@ -513,53 +513,73 @@ if [ IsOptionalHaikuImagePackageAdded Development ]
# Vision # Vision
if [ IsOptionalHaikuImagePackageAdded Vision ] { if [ IsOptionalHaikuImagePackageAdded Vision ] {
InstallOptionalHaikuImagePackage Vision if $(HAIKU_GCC_VERSION[1]) >= 4 {
: http://vision.sf.net/Vision-0.9.7-H-26012008.zip Echo "No optional package Vision available for gcc4" ;
: apps } else {
; InstallOptionalHaikuImagePackage Vision
AddSymlinkToHaikuImage home config be Applications : http://vision.sf.net/Vision-0.9.7-H-26012008.zip
: /boot/apps/Vision-0.9.7-H-26012008/Vision ; : apps
;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/Vision-0.9.7-H-26012008/Vision ;
}
} }
# WonderBrush # WonderBrush
if [ IsOptionalHaikuImagePackageAdded WonderBrush ] { if [ IsOptionalHaikuImagePackageAdded WonderBrush ] {
InstallOptionalHaikuImagePackage WonderBrush if $(HAIKU_GCC_VERSION[1]) >= 4 {
: http://www.yellowbites.com/downloads/WonderBrush-2.1.1-demo-x86-R5.zip Echo "No optional package WonderBrush available for gcc4" ;
: apps } else {
; InstallOptionalHaikuImagePackage WonderBrush
AddSymlinkToHaikuImage home config be Applications : http://www.yellowbites.com/downloads/WonderBrush-2.1.1-demo-x86-R5.zip
: /boot/apps/WonderBrush/WonderBrush ; : apps
;
AddSymlinkToHaikuImage home config be Applications
: /boot/apps/WonderBrush/WonderBrush ;
}
} }
# OpenSound drivers # OpenSound drivers
if [ IsOptionalHaikuImagePackageAdded OpenSound ] { if [ IsOptionalHaikuImagePackageAdded OpenSound ] {
InstallOptionalHaikuImagePackage OpenSound if $(HAIKU_GCC_VERSION[1]) >= 4 {
: http://revolf.free.fr/beos/oss-beos-v4.1test-bin.zip Echo "No optional package OpenSound available for gcc4" ;
: } else {
; InstallOptionalHaikuImagePackage OpenSound
: http://revolf.free.fr/beos/oss-beos-v4.1test-bin.zip
:
;
}
#UnzipArchiveToHaikuImage home : data/vv.mp3.zip : 0 ; #UnzipArchiveToHaikuImage home : data/vv.mp3.zip : 0 ;
} }
# Links web browser # Links web browser
if [ IsOptionalHaikuImagePackageAdded Links ] { if [ IsOptionalHaikuImagePackageAdded Links ] {
InstallOptionalHaikuImagePackage Links if $(HAIKU_GCC_VERSION[1]) >= 4 {
: http://revolf.free.fr/beos/links-beos-bin.zip Echo "No optional package Links available for gcc4" ;
: } else {
; InstallOptionalHaikuImagePackage Links
AddSymlinkToHaikuImage home config be Applications : http://revolf.free.fr/beos/links-beos-bin.zip
: /boot/home/config/bin/links ; :
;
AddSymlinkToHaikuImage home config be Applications
: /boot/home/config/bin/links ;
}
} }
# Pe text editor # Pe text editor
if [ IsOptionalHaikuImagePackageAdded Pe ] { if [ IsOptionalHaikuImagePackageAdded Pe ] {
InstallOptionalHaikuImagePackage Pe if $(HAIKU_GCC_VERSION[1]) >= 4 {
: http://dl.hirschkaefer.de/beos/pe-2.4-x86.zip Echo "No optional package Pe available for gcc4" ;
: apps } else {
; InstallOptionalHaikuImagePackage Pe
AddSymlinkToHaikuImage home config be Applications : http://dl.hirschkaefer.de/beos/pe-2.4-x86.zip
: /boot/apps/pe-2.4-x86/pe ; : apps
AddSymlinkToHaikuImage home config bin ;
: /boot/apps/pe-2.4-x86/lpe ; AddSymlinkToHaikuImage home config be Applications
: /boot/apps/pe-2.4-x86/pe ;
AddSymlinkToHaikuImage home config bin
: /boot/apps/pe-2.4-x86/lpe ;
}
} }
#pragma mark - Build The Image #pragma mark - Build The Image