Skip to content

Use cross-compilation for macos-all-x86_64 #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use cross-compilation for macos-all-x86_64 #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packaging/configs/components/pl-ruby-patch.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
if platform.is_cross_compiled?
if platform.is_macos?
pkg.build_requires 'gnu-sed'
pkg.environment "PATH", "/usr/local/opt/gnu-sed/libexec/gnubin:$(PATH)"
pkg.environment "PATH", "/opt/homebrew/opt/gnu-sed/libexec/gnubin:$(PATH)"
end

ruby_api_version = settings[:ruby_version].gsub(/\.\d*$/, '.0')
ruby_version_y = settings[:ruby_version].gsub(/(\d+)\.(\d+)\.(\d+)/, '\1.\2')

base_ruby = if platform.name =~ /macos/
"/usr/local/opt/ruby@#{ruby_version_y}/lib/ruby/#{ruby_api_version}"
"/opt/homebrew/opt/ruby@#{ruby_version_y}/lib/ruby/#{ruby_version_y}.0"
else
"/opt/pl-build-tools/lib/ruby/2.1.0"
end
Expand All @@ -27,7 +27,7 @@
elsif platform.name == 'solaris-11-sparc'
"sparc-solaris-2.11"
elsif platform.is_macos?
"aarch64-darwin"
"x86_64-darwin"
else
"#{platform.architecture}-linux"
end
Expand Down
5 changes: 1 addition & 4 deletions packaging/configs/components/puppet.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,7 @@
if platform.is_windows?
msgfmt = "/usr/bin/msgfmt.exe"
elsif platform.is_macos?
msgfmt = "/usr/local/opt/gettext/bin/msgfmt"
if platform.architecture == 'arm64'
msgfmt = "/opt/homebrew/bin/msgfmt"
end
msgfmt = "/opt/homebrew/bin/msgfmt"
else
msgfmt = "msgfmt"
end
Expand Down
2 changes: 2 additions & 0 deletions packaging/configs/platforms/macos-all-x86_64.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
platform 'macos-all-x86_64' do |plat|
plat.inherit_from_default
plat.brew '/opt/homebrew/bin/brew'
plat.cross_compiled true
plat.output_dir File.join('macos', 'all', 'x86_64')
end
4 changes: 0 additions & 4 deletions tasks/build.rake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ namespace :vox do
abort 'You must provide a platform.' if args[:platform].nil? || args[:platform].empty?
platform = args[:platform]
os, _ver, arch = platform.match(/^(\w+)-([\w|\.]+)-(\w+)$/).captures
if os == 'macos'
abort "You must run this build from a #{arch} machine or shell. To do this on the current host, run 'arch -#{arch} /bin/bash'" if `uname -m`.chomp != arch
abort "You must run this build with a #{arch} Ruby version. To do this on the current host, install Ruby from an #{arch} shell via 'arch -#{arch} /bin/bash'." unless `ruby -v`.chomp =~ /#{arch}/
end

engine = platform =~ /^(macos|windows)-/ ? 'local' : 'docker'
cmd = "bundle exec build #{project} #{platform} --engine #{engine}"
Expand Down