Skip to content

Use native compilation for macos-all-x86_64 #214

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

Closed
wants to merge 1 commit into from
Closed

Use native compilation for macos-all-x86_64 #214

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
7 changes: 0 additions & 7 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 @@ -8,11 +8,6 @@
# This component should also be present in the puppet-runtime project
component "pl-ruby-patch" do |pkg, settings, platform|
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)"
end

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

Expand All @@ -26,8 +21,6 @@
"powerpc64le-linux"
elsif platform.name == 'solaris-11-sparc'
"sparc-solaris-2.11"
elsif platform.is_macos?
"aarch64-darwin"
else
"#{platform.architecture}-linux"
end
Expand Down
3 changes: 0 additions & 3 deletions packaging/configs/components/puppet-runtime.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@
pkg.build_requires 'pl-ruby'
elsif platform.is_linux?
pkg.build_requires 'pl-ruby'
elsif platform.is_macos?
ruby_version_y = settings[:ruby_version].gsub(/(\d+)\.(\d+)\.(\d+)/, '\1.\2')
pkg.build_requires "ruby@#{ruby_version_y}"
end
end

Expand Down
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