diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb index c5b581e2d9..c01c3a2a62 100644 --- a/Library/Homebrew/dev-cmd/bottle.rb +++ b/Library/Homebrew/dev-cmd/bottle.rb @@ -100,18 +100,11 @@ module Homebrew return merge(args: args) end - ensure_relocation_formulae_installed! unless args.skip_relocation? args.named.to_resolved_formulae(uniq: false).each do |f| bottle_formula f, args: args end end - def ensure_relocation_formulae_installed! - Keg.relocation_formulae.each do |f| - ensure_formula_installed!(f, latest: true) - end - end - def keg_contain?(string, keg, ignores, formula_and_runtime_deps_names = nil, args:) @put_string_exists_header, @put_filenames = nil diff --git a/Library/Homebrew/extend/os/linux/keg_relocate.rb b/Library/Homebrew/extend/os/linux/keg_relocate.rb index 4fafbbd6fa..294b4aef94 100644 --- a/Library/Homebrew/extend/os/linux/keg_relocate.rb +++ b/Library/Homebrew/extend/os/linux/keg_relocate.rb @@ -83,7 +83,7 @@ class Keg def self.bottle_dependencies @bottle_dependencies ||= begin - formulae = relocation_formulae + formulae = [] gcc = Formulary.factory(CompilerSelector.preferred_gcc) if !Homebrew::EnvConfig.simulate_macos_on_linux? && DevelopmentTools.non_apple_gcc_version("gcc") < gcc.version.to_i diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index ccaf1f23e8..4d9f8f86ab 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -609,8 +609,6 @@ class FormulaInstaller if pour_bottle && !formula.bottled?(:all) && !Keg.bottle_dependencies.empty? bottle_deps = if Keg.bottle_dependencies.exclude?(formula.name) Keg.bottle_dependencies - elsif Keg.relocation_formulae.exclude?(formula.name) - Keg.relocation_formulae else [] end diff --git a/Library/Homebrew/keg_relocate.rb b/Library/Homebrew/keg_relocate.rb index e97b255967..1df8ee86a4 100644 --- a/Library/Homebrew/keg_relocate.rb +++ b/Library/Homebrew/keg_relocate.rb @@ -367,12 +367,8 @@ class Keg [] end - def self.relocation_formulae - [] - end - def self.bottle_dependencies - relocation_formulae + [] end end