[openbeos] optional packages and gcc
- From: "François Revol" <revol@xxxxxxx>
- To: openbeos@xxxxxxxxxxxxx
- Date: Sun, 20 Jan 2008 22:15:22 +0100 CET
It's nice to have packages installed to the image, but with gcc4 builds
most don't work.
How about installing them depending on gcc version ?
I think this should work but I'd let Ingo handle that.
François.
Index: build/jam/ImageRules
===================================================================
--- build/jam/ImageRules (révision 23670)
+++ build/jam/ImageRules (copie de travail)
@@ -607,7 +607,30 @@
UnzipArchiveToHaikuImage $(dirTokens) : $(zipFile) ;
}
+rule InstallOptionalHaikuImagePackageGCC3 package : url : dirTokens
+{
+ if $(HAIKU_GCC_VERSION[1]) >= 3 {
+ InstallOptionalHaikuImagePackage package : url :
dirTokens ;
+ }
+}
+rule InstallOptionalHaikuImagePackageGCC2 package : url : dirTokens
+{
+ if $(HAIKU_GCC_VERSION[1]) <= 2 {
+ InstallOptionalHaikuImagePackage package : url :
dirTokens ;
+ }
+}
+
+rule InstallOptionalHaikuImagePackageGCC package : url2 : url3 :
dirTokens
+{
+ if $(HAIKU_GCC_VERSION[1]) >= 3 {
+ InstallOptionalHaikuImagePackage package : url3 :
dirTokens ;
+ } else {
+ InstallOptionalHaikuImagePackage package : url2 :
dirTokens ;
+ }
+}
+
+
rule CreateHaikuImageMakeDirectoriesScript script
{
CreateContainerMakeDirectoriesScript
$(HAIKU_IMAGE_CONTAINER_NAME)
Other related posts: