[haiku-commits] r41358 - haiku/trunk/build/jam

  • From: scott mc <scottmc2@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 7 May 2011 05:41:15 +0200 (CEST)

Author: scottmc
Date: 2011-05-07 05:41:15 +0200 (Sat, 07 May 2011)
New Revision: 41358
Changeset: https://dev.haiku-os.org/changeset/41358

Modified:
   haiku/trunk/build/jam/OptionalPackages
Log:
Cleaned up directories for rsync and added gcc4 build.


Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages      2011-05-07 03:36:32 UTC (rev 
41357)
+++ haiku/trunk/build/jam/OptionalPackages      2011-05-07 03:41:15 UTC (rev 
41358)
@@ -1366,11 +1366,17 @@
        if $(TARGET_ARCH) != x86 {
                Echo "No optional package Rsync available for $(TARGET_ARCH)" ;
        } else {
-               InstallOptionalHaikuImagePackage
-                       rsync-3.0.7-r1a2-x86-gcc2-2010-04-22-a.zip
-                       : $(baseURL)/rsync-3.0.7-r1a2-x86-gcc2-2010-04-22-a.zip 
;
-               InstallSourceArchive rsync-3.0.7_haiku-2010-04-29.tar.xz
-                       : 
$(baseSourceURL)/2010/rsync-3.0.7_haiku-2010-04-29.tar.xz ;
+               if $(HAIKU_GCC_VERSION[1]) >= 4 {
+                       InstallOptionalHaikuImagePackage
+                               rsync-3.0.7-x86-gcc4-2011-05-06.zip
+                               : $(baseURL)/rsync-3.0.7-x86-gcc4-2011-05-06.zip
+                               : : true ;
+               } else {
+                       InstallOptionalHaikuImagePackage
+                               rsync-3.0.7-x86-gcc2-2011-05-06.zip
+                               : $(baseURL)/rsync-3.0.7-x86-gcc2-2011-05-06.zip
+                               : : true ;
+               }
        }
 }
 


Other related posts:

  • » [haiku-commits] r41358 - haiku/trunk/build/jam - scott mc