Merge pull request #9076 from EricFromCanada/arm-arch-requirement
Add support for arm64 architecture requirement
This commit is contained in:
commit
5b75133d00
@ -19,6 +19,7 @@ class ArchRequirement < Requirement
|
||||
satisfy(build_env: false) do
|
||||
case @arch
|
||||
when :x86_64 then Hardware::CPU.intel? && Hardware::CPU.is_64_bit?
|
||||
when :arm64 then Hardware::CPU.arm? && Hardware::CPU.is_64_bit?
|
||||
when :arm, :intel, :ppc then Hardware::CPU.type == @arch
|
||||
end
|
||||
end
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
# typed: false
|
||||
# frozen_string_literal: true
|
||||
|
||||
require "cli/args"
|
||||
require "extend/ENV"
|
||||
|
||||
shared_examples EnvActivation do
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
# typed: false
|
||||
# frozen_string_literal: true
|
||||
|
||||
require "cli/args"
|
||||
require "requirements/java_requirement"
|
||||
require "fileutils"
|
||||
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
# typed: false
|
||||
# frozen_string_literal: true
|
||||
|
||||
require "cli/args"
|
||||
require "extend/ENV"
|
||||
require "requirement"
|
||||
|
||||
|
||||
14
Library/Homebrew/test/requirements/arch_requirement_spec.rb
Normal file
14
Library/Homebrew/test/requirements/arch_requirement_spec.rb
Normal file
@ -0,0 +1,14 @@
|
||||
# typed: false
|
||||
# frozen_string_literal: true
|
||||
|
||||
require "requirements/arch_requirement"
|
||||
|
||||
describe ArchRequirement do
|
||||
subject(:requirement) { described_class.new([Hardware::CPU.type]) }
|
||||
|
||||
describe "#satisfied?" do
|
||||
it "supports architecture symbols" do
|
||||
expect(requirement).to be_satisfied
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -1,7 +1,6 @@
|
||||
# typed: false
|
||||
# frozen_string_literal: true
|
||||
|
||||
require "cli/args"
|
||||
require "requirements/java_requirement"
|
||||
|
||||
describe JavaRequirement do
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
# typed: false
|
||||
# frozen_string_literal: true
|
||||
|
||||
require "cli/args"
|
||||
require "requirements/linux_requirement"
|
||||
|
||||
describe LinuxRequirement do
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
# typed: false
|
||||
# frozen_string_literal: true
|
||||
|
||||
require "cli/args"
|
||||
require "requirements/macos_requirement"
|
||||
|
||||
describe MacOSRequirement do
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
# typed: false
|
||||
# frozen_string_literal: true
|
||||
|
||||
require "cli/args"
|
||||
require "requirements/osxfuse_requirement"
|
||||
|
||||
describe OsxfuseRequirement do
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
# typed: false
|
||||
# frozen_string_literal: true
|
||||
|
||||
require "cli/args"
|
||||
require "requirements/x11_requirement"
|
||||
|
||||
describe X11Requirement do
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user