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

Generalise internal cross-image handling

Browse Source
This commit is contained in:
Bo Anderson 2024-02-22 17:20:01 +00:00
parent da44787e94
commit 58874de60b
No known key found for this signature in database
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/brew.sh
View File

@ -575,7 +575,14 @@ then
HOMEBREW_FORCE_BREWED_CA_CERTIFICATES="1" HOMEBREW_FORCE_BREWED_CA_CERTIFICATES="1"
fi fi
# TEMP: backwards compatiblity with existing 10.11-cross image
# Can (probably) be removed in March 2024.
if [[ -n "${HOMEBREW_FAKE_EL_CAPITAN}" ]] if [[ -n "${HOMEBREW_FAKE_EL_CAPITAN}" ]]
then
export HOMEBREW_FAKE_MACOS="10.11.6"
fi
if [[ "${HOMEBREW_FAKE_MACOS}" =~ ^10\.11(\.|$) ]]
then then
# We only need this to work enough to update brew and build the set portable formulae, so relax the requirement. # We only need this to work enough to update brew and build the set portable formulae, so relax the requirement.
HOMEBREW_MINIMUM_GIT_VERSION="2.7.4" HOMEBREW_MINIMUM_GIT_VERSION="2.7.4"

2
Library/Homebrew/extend/os/mac/diagnostic.rb
View File

@ -138,7 +138,7 @@ module Homebrew
# With fake El Capitan for Portable Ruby, we are intentionally not using Xcode 8. # With fake El Capitan for Portable Ruby, we are intentionally not using Xcode 8.
# This is because we are not using the CLT and Xcode 8 has the 10.12 SDK. # This is because we are not using the CLT and Xcode 8 has the 10.12 SDK.
return if ENV["HOMEBREW_FAKE_EL_CAPITAN"] return if ENV["HOMEBREW_FAKE_MACOS"]
message = <<~EOS message = <<~EOS
Your Xcode (#{MacOS::Xcode.version}) is outdated. Your Xcode (#{MacOS::Xcode.version}) is outdated.

4
Library/Homebrew/os/mac.rb
View File

@ -33,8 +33,8 @@ module OS
sig { returns(MacOSVersion) } sig { returns(MacOSVersion) }
def self.full_version def self.full_version
odeprecated "`MacOS.full_version` on Linux" if Homebrew::SimulateSystem.simulating_or_running_on_linux? odeprecated "`MacOS.full_version` on Linux" if Homebrew::SimulateSystem.simulating_or_running_on_linux?
@full_version ||= if ENV["HOMEBREW_FAKE_EL_CAPITAN"] # for Portable Ruby building @full_version ||= if (fake_macos = ENV.fetch("HOMEBREW_FAKE_MACOS", nil)) # for Portable Ruby building
MacOSVersion.new("10.11.6") MacOSVersion.new(fake_macos)
else else
MacOSVersion.new(VERSION) MacOSVersion.new(VERSION)
end end

2
Library/Homebrew/os/mac/xcode.rb
View File

@ -73,7 +73,7 @@ module OS
# With fake El Capitan for Portable Ruby, we want the full 10.11 SDK so that we can link # With fake El Capitan for Portable Ruby, we want the full 10.11 SDK so that we can link
# against the correct set of libraries in the SDK sysroot rather than the system's copies. # against the correct set of libraries in the SDK sysroot rather than the system's copies.
# We therefore do not use the CLT under this setup, which installs to /usr/include. # We therefore do not use the CLT under this setup, which installs to /usr/include.
return false if ENV["HOMEBREW_FAKE_EL_CAPITAN"] return false if ENV["HOMEBREW_FAKE_MACOS"]
without_clt? without_clt?
end end