Remove Keg.relocation_formulae
We no longer use any formulae for relocation.
This commit is contained in:
parent
74e933caa3
commit
2ddce84225
@ -100,18 +100,11 @@ module Homebrew
|
|||||||
return merge(args: args)
|
return merge(args: args)
|
||||||
end
|
end
|
||||||
|
|
||||||
ensure_relocation_formulae_installed! unless args.skip_relocation?
|
|
||||||
args.named.to_resolved_formulae(uniq: false).each do |f|
|
args.named.to_resolved_formulae(uniq: false).each do |f|
|
||||||
bottle_formula f, args: args
|
bottle_formula f, args: args
|
||||||
end
|
end
|
||||||
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:)
|
def keg_contain?(string, keg, ignores, formula_and_runtime_deps_names = nil, args:)
|
||||||
@put_string_exists_header, @put_filenames = nil
|
@put_string_exists_header, @put_filenames = nil
|
||||||
|
|
||||||
|
@ -83,7 +83,7 @@ class Keg
|
|||||||
|
|
||||||
def self.bottle_dependencies
|
def self.bottle_dependencies
|
||||||
@bottle_dependencies ||= begin
|
@bottle_dependencies ||= begin
|
||||||
formulae = relocation_formulae
|
formulae = []
|
||||||
gcc = Formulary.factory(CompilerSelector.preferred_gcc)
|
gcc = Formulary.factory(CompilerSelector.preferred_gcc)
|
||||||
if !Homebrew::EnvConfig.simulate_macos_on_linux? &&
|
if !Homebrew::EnvConfig.simulate_macos_on_linux? &&
|
||||||
DevelopmentTools.non_apple_gcc_version("gcc") < gcc.version.to_i
|
DevelopmentTools.non_apple_gcc_version("gcc") < gcc.version.to_i
|
||||||
|
@ -609,8 +609,6 @@ class FormulaInstaller
|
|||||||
if pour_bottle && !formula.bottled?(:all) && !Keg.bottle_dependencies.empty?
|
if pour_bottle && !formula.bottled?(:all) && !Keg.bottle_dependencies.empty?
|
||||||
bottle_deps = if Keg.bottle_dependencies.exclude?(formula.name)
|
bottle_deps = if Keg.bottle_dependencies.exclude?(formula.name)
|
||||||
Keg.bottle_dependencies
|
Keg.bottle_dependencies
|
||||||
elsif Keg.relocation_formulae.exclude?(formula.name)
|
|
||||||
Keg.relocation_formulae
|
|
||||||
else
|
else
|
||||||
[]
|
[]
|
||||||
end
|
end
|
||||||
|
@ -367,12 +367,8 @@ class Keg
|
|||||||
[]
|
[]
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.relocation_formulae
|
|
||||||
[]
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.bottle_dependencies
|
def self.bottle_dependencies
|
||||||
relocation_formulae
|
[]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user