From f8b1bf84a279d5bc4e5a69e49c7fb5c6352053ba Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Tue, 2 Mar 2010 14:42:30 +0000 Subject: [PATCH] Added XZ-Utils as an optional package. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35721 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackageDependencies | 2 ++ build/jam/OptionalPackages | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies index fb1d616d6f..b2abc24806 100644 --- a/build/jam/OptionalPackageDependencies +++ b/build/jam/OptionalPackageDependencies @@ -19,3 +19,5 @@ OptionalPackageDependencies Git : Expat Curl OpenSSL ; OptionalPackageDependencies Curl : OpenSSL ; OptionalPackageDependencies NetFS : UserlandFS ; OptionalPackageDependencies Vim : LibIconv ; +OptionalPackageDependencies XZ-Utils : Tar ; + diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 6c218a1a0a..6a6d3150b8 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -1172,6 +1172,27 @@ if [ IsOptionalHaikuImagePackageAdded WonderBrush ] { } +# XZ-Utils +if [ IsOptionalHaikuImagePackageAdded XZ-Utils ] { + if $(TARGET_ARCH) != x86 { + Echo "No optional package XZ-Utils available for $(TARGET_ARCH)" ; + } else { + InstallOptionalHaikuImagePackage xz-utils-4.999.9-x86-gcc4-2010-02-25.zip + : $(baseURL)/xz-utils-4.999.9-x86-gcc4-2010-02-25.zip + : + ; + AddExpanderRuleToHaikuImage "application/x-xz" : .tar.xz + : "xz -dc \\0045s | tar tvf -" + : "xz -dc \\0045s | tar xvf -" + ; + AddExpanderRuleToHaikuImage "application/x-xz" : .txz + : "echo \\0045s | sed 's/.xz\\\$//g'" + : "xz -df \\0045s" + ; + } +} + + # Yasm if [ IsOptionalHaikuImagePackageAdded Yasm ] { if $(TARGET_ARCH) != x86 {