Skip bottle relocation on Apple Silicon with default prefix

Library/Homebrew/.ruby-version

@@ -1 +1 @@
-3.3.7
+3.2.2

Library/Homebrew/cmd/install.rb

@@ -431,3 +431,4 @@ def run
     end
   end
 end
+# Comment

Library/Homebrew/extend/os/bottles.rb

@@ -2,3 +2,4 @@
 # frozen_string_literal: true
 
 require "extend/os/mac/utils/bottles" if OS.mac?
+require "extend/os/linux/utils/bottles" if OS.linux?

Library/Homebrew/extend/os/linux/utils/bottles.rb

@@ -0,0 +1,18 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Utils
+  module Bottles
+    class << self
+      module LinuxOverride
+        # Linux implementation stays with the default
+        sig { returns(T::Boolean) }
+        def on_macos?
+          false
+        end
+      end
+
+      prepend LinuxOverride
+    end
+  end
+end

Library/Homebrew/extend/os/mac/formula_installer.rb

@@ -13,6 +13,11 @@ def fresh_install?(formula)
         !::Homebrew::EnvConfig.developer? && !OS::Mac.version.outdated_release? &&
           (!installed_as_dependency? || !formula.any_version_installed?)
       end
+
+      sig { returns(T::Boolean) }
+      def on_macos?
+        true
+      end
     end
   end
 end

Library/Homebrew/extend/os/mac/utils/bottles.rb

@@ -11,6 +11,32 @@ def tag(tag = nil)
 
           super
         end
+
+        # Determines if bottle relocation should be skipped for Apple Silicon with default prefix
+        sig { params(keg: T.nilable(Keg)).returns(T::Boolean) }
+        def skip_relocation_for_apple_silicon?(keg = nil)
+          return false unless Hardware::CPU.arm?
+          return false if HOMEBREW_PREFIX.to_s != HOMEBREW_MACOS_ARM_DEFAULT_PREFIX
+
+          # First check if enabled by env var for gradual rollout
+          return true if ENV.fetch("HOMEBREW_BOTTLE_SKIP_RELOCATION_ARM64", "false") == "true"
+
+          # If not explicitly enabled by env var, check if binaries need relocation
+          return false unless keg
+
+          !binaries_need_relocation?(keg)
+        end
+
+        # Determines if binary files in a keg need relocation
+        sig { params(keg: Keg).returns(T::Boolean) }
+        def binaries_need_relocation?(keg)
+          keg.mach_o_files.any? do |file|
+            # Check if dylib ID contains paths that need relocation
+            (file.dylib? && file.dylib_id&.include?(HOMEBREW_MACOS_ARM_DEFAULT_PREFIX)) ||
+              # Check if linked libraries contain paths that need relocation
+              file.dynamically_linked_libraries.any? { |lib| lib.include?(HOMEBREW_MACOS_ARM_DEFAULT_PREFIX) }
+          end
+        end
       end
 
       prepend MacOSOverride

Library/Homebrew/formula.rb

@@ -240,6 +240,7 @@ def initialize(name, path, spec, alias_path: nil, tap: nil, force_bottle: false)
     @version_scheme = T.let(self.class.version_scheme || 0, Integer)
     @head = T.let(nil, T.nilable(SoftwareSpec))
     @stable = T.let(nil, T.nilable(SoftwareSpec))
+    @keg_only_reason = T.let(nil, T.nilable(KegOnlyReason))
 
     @force_bottle = T.let(force_bottle, T::Boolean)
 
@@ -1403,7 +1404,7 @@ def caveats = nil
   # @api internal
   sig { returns(T::Boolean) }
   def keg_only?
-    return false unless keg_only_reason
+    return false unless @keg_only_reason
 
     keg_only_reason.applicable?
   end

Library/Homebrew/formula_installer.rb

@@ -29,6 +29,10 @@
 # Installer for a formula.
 class FormulaInstaller
   include FormulaCellarChecks
+  sig { returns(T::Boolean) }
+  def on_macos?
+    false
+  end
 
   ETC_VAR_DIRS = T.let([HOMEBREW_PREFIX/"etc", HOMEBREW_PREFIX/"var"].freeze, T::Array[Pathname])
 
@@ -1502,6 +1506,10 @@ def pour
     tab.unused_options = []
     tab.built_as_bottle = true
     tab.poured_from_bottle = true
+    if Hardware::CPU.arm? && on_macos?
+      keg_obj = Keg.new(formula.prefix)
+      tab.skip_relocation_for_apple_silicon = Utils::Bottles.skip_relocation_for_apple_silicon?(keg_obj)
+    end
     tab.loaded_from_api = formula.loaded_from_api?
     tab.installed_as_dependency = installed_as_dependency?
     tab.installed_on_request = installed_on_request?

Library/Homebrew/keg_relocate.rb

@@ -105,6 +105,9 @@ def prepare_relocation_to_placeholders
   alias generic_prepare_relocation_to_placeholders prepare_relocation_to_placeholders
 
   def replace_locations_with_placeholders
+    # Skip relocation for Apple Silicon with default prefix
+    return [] if Utils::Bottles.skip_relocation_for_apple_silicon?(self)
+
     relocation = prepare_relocation_to_placeholders.freeze
     relocate_dynamic_linkage(relocation)
     replace_text_in_files(relocation)
@@ -125,7 +128,10 @@ def prepare_relocation_to_locations
   end
   alias generic_prepare_relocation_to_locations prepare_relocation_to_locations
 
-  def replace_placeholders_with_locations(files, skip_linkage: false)
+  def replace_placeholders_with_locations(files = nil, skip_linkage: false)
+    # Skip relocation for Apple Silicon with default prefix
+    return if Utils::Bottles.skip_relocation_for_apple_silicon?(self)
+
     relocation = prepare_relocation_to_locations.freeze
     relocate_dynamic_linkage(relocation) unless skip_linkage
     replace_text_in_files(relocation, files:)

Library/Homebrew/tab.rb

@@ -77,19 +77,20 @@ def self.from_file_content(content, path)
 
   def self.empty
     attributes = {
-      "homebrew_version"        => HOMEBREW_VERSION,
-      "installed_as_dependency" => false,
-      "installed_on_request"    => false,
-      "loaded_from_api"         => false,
-      "time"                    => nil,
-      "runtime_dependencies"    => nil,
-      "arch"                    => nil,
-      "source"                  => {
+      "homebrew_version"                  => HOMEBREW_VERSION,
+      "installed_as_dependency"           => false,
+      "installed_on_request"              => false,
+      "loaded_from_api"                   => false,
+      "time"                              => nil,
+      "runtime_dependencies"              => nil,
+      "arch"                              => nil,
+      "source"                            => {
         "path"         => nil,
         "tap"          => nil,
         "tap_git_head" => nil,
       },
-      "built_on"                => DevelopmentTools.build_system_info,
+      "built_on"                          => DevelopmentTools.build_system_info,
+      "skip_relocation_for_apple_silicon" => false,
     }
 
     new(attributes)
@@ -140,7 +141,7 @@ class Tab < AbstractTab
   # @api internal
   attr_accessor :poured_from_bottle
 
-  attr_accessor :built_as_bottle, :changed_files, :stdlib, :aliases
+  attr_accessor :built_as_bottle, :changed_files, :stdlib, :aliases, :skip_relocation_for_apple_silicon
   attr_writer :used_options, :unused_options, :compiler, :source_modified_time
   attr_reader :tapped_from
 
@@ -399,24 +400,25 @@ def source_modified_time
 
   def to_json(options = nil)
     attributes = {
-      "homebrew_version"        => homebrew_version,
-      "used_options"            => used_options.as_flags,
-      "unused_options"          => unused_options.as_flags,
-      "built_as_bottle"         => built_as_bottle,
-      "poured_from_bottle"      => poured_from_bottle,
-      "loaded_from_api"         => loaded_from_api,
-      "installed_as_dependency" => installed_as_dependency,
-      "installed_on_request"    => installed_on_request,
-      "changed_files"           => changed_files&.map(&:to_s),
-      "time"                    => time,
-      "source_modified_time"    => source_modified_time.to_i,
-      "stdlib"                  => stdlib&.to_s,
-      "compiler"                => compiler&.to_s,
-      "aliases"                 => aliases,
-      "runtime_dependencies"    => runtime_dependencies,
-      "source"                  => source,
-      "arch"                    => arch,
-      "built_on"                => built_on,
+      "homebrew_version"                  => homebrew_version,
+      "used_options"                      => used_options.as_flags,
+      "unused_options"                    => unused_options.as_flags,
+      "built_as_bottle"                   => built_as_bottle,
+      "poured_from_bottle"                => poured_from_bottle,
+      "skip_relocation_for_apple_silicon" => skip_relocation_for_apple_silicon,
+      "loaded_from_api"                   => loaded_from_api,
+      "installed_as_dependency"           => installed_as_dependency,
+      "installed_on_request"              => installed_on_request,
+      "changed_files"                     => changed_files&.map(&:to_s),
+      "time"                              => time,
+      "source_modified_time"              => source_modified_time.to_i,
+      "stdlib"                            => stdlib&.to_s,
+      "compiler"                          => compiler&.to_s,
+      "aliases"                           => aliases,
+      "runtime_dependencies"              => runtime_dependencies,
+      "source"                            => source,
+      "arch"                              => arch,
+      "built_on"                          => built_on,
     }
     attributes.delete("stdlib") if attributes["stdlib"].blank?
 

Library/Homebrew/test/utils/bottles/bottles_spec.rb

@@ -53,4 +53,102 @@ class #{Formulary.class_s(formula_name)} < Formula
       end
     end
   end
+
+  describe "#skip_relocation_for_apple_silicon?" do
+    let(:keg) { instance_double(Keg) }
+
+    before do
+      allow(keg).to receive(:mach_o_files).and_return([])
+    end
+
+    it "returns true for Apple Silicon with default prefix when enabled by env var" do
+      allow(Hardware::CPU).to receive(:arm?).and_return(true)
+      allow(OS).to receive(:mac?).and_return(true)
+      allow(HOMEBREW_PREFIX).to receive(:to_s).and_return(HOMEBREW_MACOS_ARM_DEFAULT_PREFIX)
+      allow(ENV).to receive(:fetch).with("HOMEBREW_BOTTLE_SKIP_RELOCATION_ARM64", "false").and_return("true")
+
+      expect(described_class.skip_relocation_for_apple_silicon?).to be true
+    end
+
+    it "returns true for Apple Silicon with default prefix when no binaries need relocation" do
+      allow(Hardware::CPU).to receive(:arm?).and_return(true)
+      allow(OS).to receive(:mac?).and_return(true)
+      allow(HOMEBREW_PREFIX).to receive(:to_s).and_return(HOMEBREW_MACOS_ARM_DEFAULT_PREFIX)
+      allow(ENV).to receive(:fetch).with("HOMEBREW_BOTTLE_SKIP_RELOCATION_ARM64", "false").and_return("false")
+
+      expect(described_class.skip_relocation_for_apple_silicon?(keg)).to be true
+    end
+
+    it "returns false for Apple Silicon with default prefix when binaries need relocation" do
+      mach_o_file = instance_double(MachO::MachOFile)
+      allow(keg).to receive(:mach_o_files).and_return([mach_o_file])
+      allow(mach_o_file).to receive_messages(
+        dylib?:   true,
+        dylib_id: "/usr/local/lib/example.dylib",
+      )
+
+      allow(Hardware::CPU).to receive(:arm?).and_return(true)
+      allow(OS).to receive(:mac?).and_return(true)
+      allow(HOMEBREW_PREFIX).to receive(:to_s).and_return(HOMEBREW_MACOS_ARM_DEFAULT_PREFIX)
+      allow(ENV).to receive(:fetch).with("HOMEBREW_BOTTLE_SKIP_RELOCATION_ARM64", "false").and_return("false")
+
+      expect(described_class.skip_relocation_for_apple_silicon?(keg)).to be false
+    end
+
+    it "returns false for Intel Mac" do
+      allow(Hardware::CPU).to receive(:arm?).and_return(false)
+      allow(OS).to receive(:mac?).and_return(true)
+
+      expect(described_class.skip_relocation_for_apple_silicon?).to be false
+      expect(described_class.skip_relocation_for_apple_silicon?(keg)).to be false
+    end
+
+    it "returns false for custom prefix on Apple Silicon" do
+      allow(Hardware::CPU).to receive(:arm?).and_return(true)
+      allow(OS).to receive(:mac?).and_return(true)
+      allow(HOMEBREW_PREFIX).to receive(:to_s).and_return("/custom/path")
+
+      expect(described_class.skip_relocation_for_apple_silicon?).to be false
+      expect(described_class.skip_relocation_for_apple_silicon?(keg)).to be false
+    end
+  end
+
+  describe "#binaries_need_relocation?" do
+    let(:keg) { instance_double(Keg) }
+    let(:mach_o_file) { instance_double(MachO::MachOFile) }
+
+    it "returns true when dylib has /usr/local path" do
+      allow(OS).to receive(:mac?).and_return(true)
+      allow(keg).to receive(:mach_o_files).and_return([mach_o_file])
+      allow(mach_o_file).to receive_messages(
+        dylib?:   true,
+        dylib_id: "/usr/local/lib/example.dylib",
+      )
+      allow(mach_o_file).to receive(:dynamically_linked_libraries).and_return([])
+
+      expect(described_class.binaries_need_relocation?(keg)).to be true
+    end
+
+    it "returns true when linked libraries have /usr/local path" do
+      allow(OS).to receive(:mac?).and_return(true)
+      allow(keg).to receive(:mach_o_files).and_return([mach_o_file])
+      allow(mach_o_file).to receive_messages(
+        dylib?:   true,
+        dylib_id: "/usr/local/lib/example.dylib",
+      )
+
+      expect(described_class.binaries_need_relocation?(keg)).to be true
+    end
+
+    it "returns false when no paths need relocation" do
+      allow(OS).to receive(:mac?).and_return(true)
+      allow(keg).to receive(:mach_o_files).and_return([mach_o_file])
+      allow(mach_o_file).to receive_messages(
+        dylib?:   true,
+        dylib_id: "/usr/local/lib/example.dylib",
+      )
+
+      expect(described_class.binaries_need_relocation?(keg)).to be false
+    end
+  end
 end

Library/Homebrew/utils/bottles.rb

@@ -128,6 +128,20 @@ def load_tab(formula)
         end
       end
 
+      # Determines if bottle relocation should be skipped for Apple Silicon with default prefix
+      sig { params(_keg: T.nilable(Keg)).returns(T::Boolean) }
+      def skip_relocation_for_apple_silicon?(_keg = nil)
+        # This is a stub that will be overriden in platform-specific files
+        false
+      end
+
+      # Determines if binary files in a keg need relocation
+      sig { params(_keg: Keg).returns(T::Boolean) }
+      def binaries_need_relocation?(_keg)
+        # This is a stub that will be overriden in platform-specific files
+        false
+      end
+
       private
 
       def bottle_file_list(bottle_file)
@@ -350,3 +364,4 @@ def find_matching_tag(tag, no_older_versions: false)
 end
 
 require "extend/os/bottles"
+# Trigger CI run

Library/Homebrew/vendor/bundle/ruby/3.3.0/gems/bindata-2.5.0/lib/bindata.rb

@@ -25,9 +25,9 @@
 require 'bindata/warnings'
 
 # = BinData
-# 
+#
 # A declarative way to read and write structured binary data.
-# 
+#
 # A full reference manual is available online at
 # https://github.com/dmendel/bindata/wiki
 #

Library/Homebrew/vendor/bundle/ruby/3.3.0/gems/bindata-2.5.0/lib/bindata/framework.rb

@@ -2,7 +2,7 @@ module BinData
   # Error raised when unexpected results occur when reading data from IO.
   class ValidityError < StandardError; end
 
-  # All methods provided by the framework are to be implemented or overridden 
+  # All methods provided by the framework are to be implemented or overridden
   # by subclasses of BinData::Base.
   module Framework
     # Initializes the state of the object.  All instance variables that

Library/Homebrew/vendor/bundle/ruby/3.3.0/gems/concurrent-ruby-1.3.5/lib/concurrent-ruby/concurrent/collection/java_non_concurrent_priority_queue.rb

@@ -5,7 +5,7 @@ module Collection
 
 
       # @!macro priority_queue
-      # 
+      #
       # @!visibility private
       # @!macro internal_implementation_note
       class JavaNonConcurrentPriorityQueue