From df38dcc3d1edc34af7c561b0cd6208a7cac54a7a Mon Sep 17 00:00:00 2001 From: Eric Knibbe Date: Mon, 28 Aug 2023 17:33:01 -0400 Subject: [PATCH] dependency: consider bounds when comparing macOS deps --- Library/Homebrew/dependency.rb | 8 ++++++++ Library/Homebrew/dependency_collector.rb | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/dependency.rb b/Library/Homebrew/dependency.rb index 41bec8884a..857977b475 100644 --- a/Library/Homebrew/dependency.rb +++ b/Library/Homebrew/dependency.rb @@ -231,6 +231,14 @@ class UsesFromMacOSDependency < Dependency @bounds = bounds end + def ==(other) + instance_of?(other.class) && name == other.name && tags == other.tags && bounds == other.bounds + end + + def hash + [name, tags, bounds].hash + end + def installed? use_macos_install? || super end diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb index 6979697402..6a1021ef57 100644 --- a/Library/Homebrew/dependency_collector.rb +++ b/Library/Homebrew/dependency_collector.rb @@ -65,8 +65,6 @@ class DependencyCollector def cache_key(spec) if spec.is_a?(Resource) && spec.download_strategy <= CurlDownloadStrategy File.extname(spec.url) - elsif spec.is_a?(UsesFromMacOSDependency) - "#{spec.name}-#{spec.bounds}" else spec end