mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

formula_cellar_checks: show mismatched arch in check_binary_arches

Browse Source 
This will make the error more informative by showing the architecture a
binary was built for along with the error message.

Before:

    foo:
      * Binaries built for an incompatible architecture were installed into foo's prefix.
        The offending files are:
          /usr/local/Cellar/foo/1.0/lib/libbar.dylib
          /usr/local/Cellar/foo/1.0/lib/libfoo.dylib
          /usr/local/Cellar/foo/1.0/lib/libincompatible.dylib
        Unexpected universal binaries were found.
        The offending files are:
          /usr/local/Cellar/foo/1.0/lib/liball.dylib
          /usr/local/Cellar/foo/1.0/lib/libuniversal.dylib

After:

    foo:
      * Binaries built for a non-native architecture were installed into foo's prefix.
        The offending files are:
          /usr/local/Cellar/foo/1.0/lib/libbar.dylib        (i386)
          /usr/local/Cellar/foo/1.0/lib/libfoo.dylib        (arm64)
          /usr/local/Cellar/foo/1.0/lib/libincompatible.dylib       (universal)
        Unexpected universal binaries were found.
        The offending files are:
          /usr/local/Cellar/foo/1.0/lib/liball.dylib
          /usr/local/Cellar/foo/1.0/lib/libuniversal.dylib
This commit is contained in:
Carlo Cabrera 2021-07-23 11:40:01 +08:00
parent b18bbacced
commit 8e6731b7c7
No known key found for this signature in database
GPG Key ID: C74D447FC549A1D0
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/formula_cellar_checks.rb
View File

@ -320,14 +320,16 @@ module FormulaCellarChecks
return if !OS.mac? && !OS.linux? return if !OS.mac? && !OS.linux?
keg = Keg.new(formula.prefix) keg = Keg.new(formula.prefix)
mismatches = keg.binary_executable_or_library_files.reject do |file| mismatches = {}
file.arch == Hardware::CPU.arch keg.binary_executable_or_library_files.each do |file|
farch = file.arch
mismatches[file] = farch unless farch == Hardware::CPU.arch
end end
return if mismatches.empty? return if mismatches.empty?
compatible_universal_binaries, mismatches = mismatches.partition do |file| compatible_universal_binaries, mismatches = mismatches.partition do |file, arch|
file.arch == :universal && file.archs.include?(Hardware::CPU.arch) arch == :universal && file.archs.include?(Hardware::CPU.arch)
end end.map(&:to_h) # To prevent transformation into nested arrays
universal_binaries_expected = if formula.tap.present? && formula.tap.core_tap? universal_binaries_expected = if formula.tap.present? && formula.tap.core_tap?
tap_audit_exception(:universal_binary_allowlist, formula.name) tap_audit_exception(:universal_binary_allowlist, formula.name)
@ -340,9 +342,9 @@ module FormulaCellarChecks
if mismatches.present? if mismatches.present?
s += <<~EOS s += <<~EOS
Binaries built for an incompatible architecture were installed into #{formula}'s prefix. Binaries built for a non-native architecture were installed into #{formula}'s prefix.
The offending files are: The offending files are:
#{mismatches * "\n "} #{mismatches.map { |m| "#{m.first}\t(#{m.last})" } * "\n "}
EOS EOS
end end
@ -350,7 +352,7 @@ module FormulaCellarChecks
s += <<~EOS s += <<~EOS
Unexpected universal binaries were found. Unexpected universal binaries were found.
The offending files are: The offending files are:
#{compatible_universal_binaries * "\n "} #{compatible_universal_binaries.keys * "\n "}
EOS EOS
end end