Merge pull request #19070 from Homebrew/dependabot/bundler/Library/Ho…

…mebrew/rubocop-1.70.0 build(deps-dev): bump rubocop from 1.69.2 to 1.70.0 in /Library/Homebrew
Homebrew · Jan 12, 2025 · 2432d01 · 2432d01
2 parents 6b1c54d + ffc661b
commit 2432d01
Show file tree

Hide file tree

Showing 6 changed files with 1,248 additions and 805 deletions.
diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock
@@ -74,7 +74,7 @@ GEM
     rspec-support (3.13.2)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.69.2)
+    rubocop (1.70.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

diff --git a/Library/Homebrew/cmd/list.rb b/Library/Homebrew/cmd/list.rb
@@ -245,14 +245,15 @@ def list_casks
     class PrettyListing
       sig { params(path: T.any(String, Pathname, Keg)).void }
       def initialize(path)
+        valid_lib_extensions = [".dylib", ".pc"]
         Pathname.new(path).children.sort_by { |p| p.to_s.downcase }.each do |pn|
           case pn.basename.to_s
           when "bin", "sbin"
             pn.find { |pnn| puts pnn unless pnn.directory? }
           when "lib"
             print_dir pn do |pnn|
               # dylibs have multiple symlinks and we don't care about them
-              (pnn.extname == ".dylib" || pnn.extname == ".pc") && !pnn.symlink?
+              valid_lib_extensions.include?(pnn.extname) && !pnn.symlink?
             end
           when ".brew"
             next # Ignore .brew

diff --git a/Library/Homebrew/extend/os/linux/extend/ENV/super.rb b/Library/Homebrew/extend/os/linux/extend/ENV/super.rb
@@ -29,7 +29,8 @@ def setup_build_environment(formula: nil, cc: nil, build_bottle: false, bottle_a
     self["HOMEBREW_OPTIMIZATION_LEVEL"] = "O2"
     self["HOMEBREW_DYNAMIC_LINKER"] = determine_dynamic_linker_path
     self["HOMEBREW_RPATH_PATHS"] = determine_rpath_paths(@formula)
-    self["M4"] = "#{HOMEBREW_PREFIX}/opt/m4/bin/m4" if deps.any? { |d| d.name == "libtool" || d.name == "bison" }
+    m4_path_deps = ["libtool", "bison"]
+    self["M4"] = "#{HOMEBREW_PREFIX}/opt/m4/bin/m4" if deps.any? { m4_path_deps.include?(_1.name) }
   end
 
   def homebrew_extra_paths