Disable xz-utils optional package for gcc 2

This commit is contained in:
Ingo Weinhold
2013-06-18 11:32:23 +02:00
parent 7f453e3b5f
commit 56c3ef1d73
+14 -14
View File
@@ -2171,22 +2171,22 @@ if [ IsOptionalHaikuImagePackageAdded XZ-Utils ] {
InstallOptionalHaikuImagePackage InstallOptionalHaikuImagePackage
$(baseURL)/xz-utils-5.0.4-x86-gcc4-2013-02-16.zip ; $(baseURL)/xz-utils-5.0.4-x86-gcc4-2013-02-16.zip ;
} else { } else {
# TODO: Remove! It's actually the repackaged gcc 4 archive. Echo "No optional package XZ-Utils available for gcc"
InstallOptionalHaikuImagePackage $(HAIKU_GCC_VERSION[1]) ;
$(hpkgBaseURL)/xz-utils-5.0.1-2-x86_gcc2.hpkg ;
} }
AddExpanderRuleToHaikuImage "application/x-xz" : .tar.xz # TODO: Move rules into package!
: "tar -Jtvf \\0045s" # AddExpanderRuleToHaikuImage "application/x-xz" : .tar.xz
: "tar -Jxvf \\0045s" # : "tar -Jtvf \\0045s"
; # : "tar -Jxvf \\0045s"
AddExpanderRuleToHaikuImage "application/x-xz" : .txz # ;
: "tar -Jtvf \\0045s" # AddExpanderRuleToHaikuImage "application/x-xz" : .txz
: "tar -Jxvf \\0045s" # : "tar -Jtvf \\0045s"
; # : "tar -Jxvf \\0045s"
AddExpanderRuleToHaikuImage "application/x-xz" : .xz # ;
: "echo \\0045s | sed 's/.xz\\\$//g'" # AddExpanderRuleToHaikuImage "application/x-xz" : .xz
: "xz -df \\0045s" # : "echo \\0045s | sed 's/.xz\\\$//g'"
# : "xz -df \\0045s"
; ;
} else { } else {
Echo "No optional package XZ-Utils available for $(TARGET_ARCH)" ; Echo "No optional package XZ-Utils available for $(TARGET_ARCH)" ;