From f33d4712c03d84618a9e8a9d13fec8d48b1709f9 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 5 May 2011 18:47:15 +0000 Subject: [PATCH] Updated xz-utils to 5.0.1, removed unneeded if statement as the xz-utils gcc4 works on both gcc2 and gcc4. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41322 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackages | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index be39a6f62f..b29ca48294 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -1696,17 +1696,9 @@ if [ IsOptionalHaikuImagePackageAdded XZ-Utils ] { if $(TARGET_ARCH) != x86 { Echo "No optional package XZ-Utils available for $(TARGET_ARCH)" ; } else { - if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage - xz-utils-5.0.1-x86-gcc4-2011-03-16.zip - : $(baseURL)/xz-utils-5.0.1-x86-gcc4-2011-03-16.zip ; - } else { - InstallOptionalHaikuImagePackage - xz-utils-4.999.9-r1a2-x86-gcc4-2010-04-25-a.zip - : $(baseURL)/xz-utils-4.999.9-r1a2-x86-gcc4-2010-04-25-a.zip ; - } - InstallSourceArchive xz-utils-4.999.9_haiku-2010-04-29.tar.xz - : $(baseSourceURL)/2010/xz-utils-4.999.9_haiku-2010-04-29.tar.xz ; + InstallOptionalHaikuImagePackage + xz-utils-5.0.1-x86-gcc4-2011-03-16.zip + : $(baseURL)/xz-utils-5.0.1-x86-gcc4-2011-03-16.zip ; AddExpanderRuleToHaikuImage "application/x-xz" : .tar.xz : "tar -Jtvf \\0045s" : "tar -Jxvf \\0045s"