From a53eca8cdee26ad0c00a4add89b746d08a5dc87c Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Sun, 16 Oct 2016 02:03:23 -0700 Subject: [PATCH] dependency_collector: need xz dep on <= macOS 10.8 Mountain Lion: http://opensource.apple.com/source/libarchive/libarchive-25.1/config.h `/* #undef HAVE_LIBLZMA */` Mavericks: http://opensource.apple.com/source/libarchive/libarchive-29/config.h `#define HAVE_LIBLZMA 1` --- Library/Homebrew/extend/os/mac/dependency_collector.rb | 2 +- .../Homebrew/test/test_os_mac_dependency_collector.rb | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/extend/os/mac/dependency_collector.rb b/Library/Homebrew/extend/os/mac/dependency_collector.rb index 72c619105a..8d660321e6 100644 --- a/Library/Homebrew/extend/os/mac/dependency_collector.rb +++ b/Library/Homebrew/extend/os/mac/dependency_collector.rb @@ -5,7 +5,7 @@ class DependencyCollector end def xz_dep(tags) - return if MacOS.version >= :lion + return if MacOS.version >= :mavericks Dependency.new("xz", tags) end end diff --git a/Library/Homebrew/test/test_os_mac_dependency_collector.rb b/Library/Homebrew/test/test_os_mac_dependency_collector.rb index d3a45b1fb5..4fdf3ebe42 100644 --- a/Library/Homebrew/test/test_os_mac_dependency_collector.rb +++ b/Library/Homebrew/test/test_os_mac_dependency_collector.rb @@ -15,7 +15,7 @@ class OSMacDependencyCollectorTests < Homebrew::TestCase end def test_tar_needs_xz_dependency - MacOS.stubs(:version).returns(MacOS::Version.new("10.7")) + MacOS.stubs(:version).returns(MacOS::Version.new("10.9")) refute DependencyCollector.tar_needs_xz_dependency? end @@ -41,15 +41,15 @@ class OSMacDependencyCollectorTests < Homebrew::TestCase assert_nil find_dependency("ant") end - def test_resource_dep_xz_url_pre_lion - MacOS.stubs(:version).returns(MacOS::Version.new("10.6")) + def test_resource_dep_xz_pre_mavericks + MacOS.stubs(:version).returns(MacOS::Version.new("10.8")) resource = Resource.new resource.url("http://example.com/foo.tar.xz") assert_equal Dependency.new("xz", [:build]), @d.add(resource) end - def test_resource_dep_xz_lion_or_newer - MacOS.stubs(:version).returns(MacOS::Version.new("10.7")) + def test_resource_dep_xz_mavericks_or_newer + MacOS.stubs(:version).returns(MacOS::Version.new("10.9")) resource = Resource.new resource.url("http://example.com/foo.tar.xz") assert_nil @d.add(resource)