From 28d6f46e24858d1ef1c79faccf3f5688f75cf8a6 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sat, 7 May 2011 03:41:15 +0000 Subject: [PATCH] Cleaned up directories for rsync and added gcc4 build. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41358 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackages | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 10c55fdfc6..18f928099a 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -1366,11 +1366,17 @@ if [ IsOptionalHaikuImagePackageAdded Rsync ] { 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 ; + } } }