Remove Keg.relocation_formulae

We no longer use any formulae for relocation.
This commit is contained in:
Bo Anderson 2022-06-30 03:39:24 +01:00
parent 74e933caa3
commit 2ddce84225
No known key found for this signature in database
GPG Key ID: 3DB94E204E137D65
4 changed files with 2 additions and 15 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -367,12 +367,8 @@ class Keg
[]
end
def self.relocation_formulae
[]
end
def self.bottle_dependencies
relocation_formulae
[]
end
end