From b1a16deb190ae5ccb05b60a3dd10b53eaf1bae15 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sat, 15 Oct 2016 13:10:35 +0100 Subject: Use BSD tar's libarchive LZMA support if available Avoid using an unnecessary `xz` dependency when it's not needed. --- Library/Homebrew/extend/os/mac/dependency_collector.rb | 9 +++++++-- Library/Homebrew/extend/os/mac/development_tools.rb | 4 ++++ 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'Library/Homebrew/extend') diff --git a/Library/Homebrew/extend/os/mac/dependency_collector.rb b/Library/Homebrew/extend/os/mac/dependency_collector.rb index ee98045b6..72c619105 100644 --- a/Library/Homebrew/extend/os/mac/dependency_collector.rb +++ b/Library/Homebrew/extend/os/mac/dependency_collector.rb @@ -1,6 +1,11 @@ class DependencyCollector - def ant_dep(spec, tags) + def ant_dep(tags) return if MacOS.version < :mavericks - Dependency.new(spec.to_s, tags) + Dependency.new("ant", tags) + end + + def xz_dep(tags) + return if MacOS.version >= :lion + Dependency.new("xz", tags) end end diff --git a/Library/Homebrew/extend/os/mac/development_tools.rb b/Library/Homebrew/extend/os/mac/development_tools.rb index 381b26e66..7c97b9d69 100644 --- a/Library/Homebrew/extend/os/mac/development_tools.rb +++ b/Library/Homebrew/extend/os/mac/development_tools.rb @@ -76,5 +76,9 @@ class DevelopmentTools end end end + + def tar_supports_xz? + false + end end end -- cgit v1.2.3