[haiku-commits] haiku: hrev45314 - build/jam
- From: alex@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 21 Feb 2013 21:59:05 +0100 (CET)
hrev45314 adds 1 changeset to branch 'master'
old head: 32bd2dedd92c994efb538bec7fbc31f5dd5b6122
new head: 7f562d441c47fcfc89221b612ed5493f196bfcea
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=7f562d4+%5E32bd2de
----------------------------------------------------------------------------
7f562d4: Added xz-utils for x86_64 and updated to 5.0.4 (from scottmc).
[ Alex Smith <alex@xxxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45314
Commit: 7f562d441c47fcfc89221b612ed5493f196bfcea
URL: http://cgit.haiku-os.org/haiku/commit/?id=7f562d4
Author: Alex Smith <alex@xxxxxxxxxxxxxxxx>
Date: Thu Feb 21 20:58:19 2013 UTC
----------------------------------------------------------------------------
1 file changed, 13 insertions(+), 6 deletions(-)
build/jam/OptionalPackages | 19 +++++++++++++------
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 896398d..56ed53b 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -2358,12 +2358,17 @@ if [ IsOptionalHaikuImagePackageAdded WQY-MicroHei ] {
# XZ-Utils
if [ IsOptionalHaikuImagePackageAdded XZ-Utils ] {
- if $(TARGET_ARCH) != x86 {
- Echo "No optional package XZ-Utils available for
$(TARGET_ARCH)" ;
- } else {
- InstallOptionalHaikuImagePackage
- xz-utils-5.0.1-r1a4-x86-gcc4-2012-09-03.zip
- :
$(baseURL)/xz-utils-5.0.1-r1a4-x86-gcc4-2012-09-03.zip ;
+ if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
+ if $(TARGET_ARCH) = x86_64 {
+ InstallOptionalHaikuImagePackage
+ xz-utils-5.0.4-x86_64-2013-02-16.zip
+ :
$(baseURL)/xz-utils-5.0.4-x86_64-2013-02-16.zip ;
+ } else {
+ InstallOptionalHaikuImagePackage
+ xz-utils-5.0.4-x86-gcc4-2013-02-16.zip
+ :
$(baseURL)/xz-utils-5.0.4-x86-gcc4-2013-02-16.zip ;
+ }
+
AddExpanderRuleToHaikuImage "application/x-xz" : .tar.xz
: "tar -Jtvf \\0045s"
: "tar -Jxvf \\0045s"
@@ -2376,6 +2381,8 @@ if [ IsOptionalHaikuImagePackageAdded XZ-Utils ] {
: "echo \\0045s | sed 's/.xz\\\$//g'"
: "xz -df \\0045s"
;
+ } else {
+ Echo "No optional package XZ-Utils available for
$(TARGET_ARCH)" ;
}
}
Other related posts:
- » [haiku-commits] haiku: hrev45314 - build/jam - alex
