admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

add alias generic_formula_ignores formula_ignores

Browse Source
This commit is contained in:
hyuraku 2023-02-03 21:53:22 +09:00
parent 197bdedd35
commit fde7ca31b8
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/dev-cmd/bottle.rb
View File

@ -275,6 +275,8 @@ module Homebrew
ignores.compact ignores.compact
end end
alias generic_formula_ignores formula_ignores
def bottle_formula(f, args:) def bottle_formula(f, args:)
local_bottle_json = args.json? && f.local_bottle_path.present? local_bottle_json = args.json? && f.local_bottle_path.present?

10
Library/Homebrew/extend/os/linux/dev-cmd/bottle.rb
View File

@ -23,18 +23,10 @@ module Homebrew
end end
def formula_ignores(f) def formula_ignores(f)
ignores = []
cellar_regex = Regexp.escape(HOMEBREW_CELLAR) cellar_regex = Regexp.escape(HOMEBREW_CELLAR)
prefix_regex = Regexp.escape(HOMEBREW_PREFIX) prefix_regex = Regexp.escape(HOMEBREW_PREFIX)
# Ignore matches to go keg, because all go binaries are statically linked. ignores = generic_formula_ignores(f)
any_go_deps = f.deps.any? do |dep|
dep.name =~ Version.formula_optionally_versioned_regex(:go)
end
if any_go_deps
go_regex = Version.formula_optionally_versioned_regex(:go, full: false)
ignores << %r{#{cellar_regex}/#{go_regex}/[\d.]+/libexec}
end
ignores << case f.name ignores << case f.name
# On Linux, GCC installation can be moved so long as the whole directory tree is moved together: # On Linux, GCC installation can be moved so long as the whole directory tree is moved together: