Don't relocate Apple Silicon bottles for default prefix

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/utils/bottles.rb

@@ -11,6 +11,11 @@ def tag(tag = nil)
 
           super
         end
+
+        sig {returns(T::Boolean) }
+        def on_macos?
+          true
+        end
       end
 
       prepend MacOSOverride

Library/Homebrew/formula_installer.rb

@@ -1502,6 +1502,7 @@ def pour
     tab.unused_options = []
     tab.built_as_bottle = true
     tab.poured_from_bottle = true
+    if Hardware::CPU.arm? && Utils::Bottles.on_macos?
     tab.loaded_from_api = formula.loaded_from_api?
     tab.installed_as_dependency = installed_as_dependency?
     tab.installed_on_request = installed_on_request?
@@ -1730,3 +1731,4 @@ def puts_requirement_messages
 end
 
 require "extend/os/formula_installer"
+end

Library/Homebrew/keg_relocate.rb

@@ -105,6 +105,10 @@ 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 +129,11 @@ 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

@@ -90,6 +90,7 @@ def self.empty
         "tap_git_head" => nil,
       },
       "built_on"                => DevelopmentTools.build_system_info,
+      "skip_relocation_for_apple_silicon" => false,
     }
 
     new(attributes)
@@ -139,7 +140,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
 
@@ -403,6 +404,7 @@ def to_json(options = nil)
       "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,

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

@@ -53,4 +53,95 @@ class #{Formulary.class_s(formula_name)} < Formula
       end
     end
   end
+
+  describe "#skip_relocation_for_apple_silicon?" do
+    let(:keg) { 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 = double("mach_o_file")
+      allow(keg).to receive(:mach_o_files).and_return([mach_o_file])
+      allow(mach_o_file).to receive(:dylib?).and_return(true)
+      allow(mach_o_file).to receive(:dylib_id).and_return("/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) { double("keg") }
+    let(:mach_o_file) { double("mach_o_file") }
+
+    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(:dylib?).and_return(true)
+      allow(mach_o_file).to receive(:dylib_id).and_return("/usr/local/lib/libexample.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(:dylib?).and_return(false)
+      allow(mach_o_file).to receive(:dynamically_linked_libraries).and_return(["/usr/local/lib/libexample.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(:dylib?).and_return(true)
+      allow(mach_o_file).to receive(:dylib_id).and_return("/opt/homebrew/lib/libexample.dylib")
+      allow(mach_o_file).to receive(:dynamically_linked_libraries).and_return(["/opt/homebrew/lib/libother.dylib"])
+
+      expect(described_class.binaries_need_relocation?(keg)).to be false
+    end
+  end
 end

Library/Homebrew/utils/bottles.rb

@@ -128,6 +128,44 @@ 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)
+        return false unless Hardware::CPU.arm?
+        # Don't use OS.mac? directly - use the on_macos? method instead
+        return false unless on_macos?
+        return false unless 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
+
+      # Define a platform-specific method that will be overriden
+      def on_macos?
+        false  # Default implementation, will be overriden in OS/mac/bottles.rb
+      end
+
+
+      # Determines if binary files in a keg need relocation
+      sig {params(keg: Keg).returns(T::Boolean) }
+      def binaries_need_relocation?(keg)
+        # Don't use OS.mac? directly - use the on_macos? method instead
+        return false unless OS.mac?
+
+        keg.mach_o_files.any? do |file|
+          # Check if dylib ID contains paths that need relocation
+          (file.dylib? && file.dylib_id&.include?("/usr/local")) ||
+          # Check if linked libraries contain paths that need relocation
+          file.dynamically_linked_libraries.any? { |lib| lib.include?("/usr/local") }
+        end
+      end
+
+
       private
 
       def bottle_file_list(bottle_file)
@@ -350,3 +388,4 @@ def find_matching_tag(tag, no_older_versions: false)
 end
 
 require "extend/os/bottles"
+# Trigger CI run