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

Apply manual violation fixes

Browse Source
This commit is contained in:
Douglas Eichelberger 2025-01-10 11:06:11 -08:00
parent dbb731bce2
commit 0add431e69
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/cmd/list.rb
View File

@ -245,6 +245,7 @@ module Homebrew
class PrettyListing class PrettyListing
sig { params(path: T.any(String, Pathname, Keg)).void } sig { params(path: T.any(String, Pathname, Keg)).void }
def initialize(path) def initialize(path)
valid_lib_extensions = [".dylib", ".pc"]
Pathname.new(path).children.sort_by { |p| p.to_s.downcase }.each do |pn| Pathname.new(path).children.sort_by { |p| p.to_s.downcase }.each do |pn|
case pn.basename.to_s case pn.basename.to_s
when "bin", "sbin" when "bin", "sbin"
@ -252,7 +253,7 @@ module Homebrew
when "lib" when "lib"
print_dir pn do |pnn| print_dir pn do |pnn|
# dylibs have multiple symlinks and we don't care about them # dylibs have multiple symlinks and we don't care about them
[".dylib", ".pc"].include?(pnn.extname) && !pnn.symlink? valid_lib_extensions.include?(pnn.extname) && !pnn.symlink?
end end
when ".brew" when ".brew"
next # Ignore .brew next # Ignore .brew

3
Library/Homebrew/extend/os/linux/extend/ENV/super.rb
View File

@ -29,7 +29,8 @@ module Superenv
self["HOMEBREW_OPTIMIZATION_LEVEL"] = "O2" self["HOMEBREW_OPTIMIZATION_LEVEL"] = "O2"
self["HOMEBREW_DYNAMIC_LINKER"] = determine_dynamic_linker_path self["HOMEBREW_DYNAMIC_LINKER"] = determine_dynamic_linker_path
self["HOMEBREW_RPATH_PATHS"] = determine_rpath_paths(@formula) self["HOMEBREW_RPATH_PATHS"] = determine_rpath_paths(@formula)
self["M4"] = "#{HOMEBREW_PREFIX}/opt/m4/bin/m4" if deps.any? { |d| ["libtool", "bison"].include?(d.name) } m4_path_deps = ["libtool", "bison"]
self["M4"] = "#{HOMEBREW_PREFIX}/opt/m4/bin/m4" if deps.any? { m4_path_deps.include?(_1.name) }
end end
def homebrew_extra_paths def homebrew_extra_paths