Skip to content

Add some bits to support installing Ruby properly on Apple M1 #309

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
johnewart wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add some bits to support installing Ruby properly on Apple M1 #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e04689
Add some bits to support installing Ruby properly on Apple M1 archite…
johnewart May 5, 2021
4a4e5c6
Use biome constants in logic check
zombiezen May 28, 2021
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
1 change: 1 addition & 0 deletions internal/biome/biome.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ const (
const (
Intel64 = "amd64"
Intel32 = "386"
ARM64 = "arm64"
)

// Dirs holds paths to special directories in a Context.
Expand Down
13 changes: 10 additions & 3 deletions internal/buildpack/ruby.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func installRuby(ctx context.Context, sys Sys, spec yb.BuildpackSpec) (biome.Env
if _, err := biome.EvalSymlinks(ctx, sys.Biome, rbenvDir); err != nil {
log.Debugf(ctx, "rbenv not found: %v", err)
log.Infof(ctx, "Installing rbenv in %s", rbenvDir)
err := extract(ctx, sys, rbenvDir, "https://github.com/rbenv/rbenv/archive/60c933968584ac9ae7caac6dbed614740f899ec3.zip", stripTopDirectory)
err := extract(ctx, sys, rbenvDir, "https://github.com/rbenv/rbenv/archive/633436706fa9227b014b89390892db9e74f5d435.zip", stripTopDirectory)
if err != nil {
return biome.Environment{}, fmt.Errorf("download rbenv: %w", err)
}
Expand All @@ -86,15 +86,22 @@ func installRuby(ctx context.Context, sys Sys, spec yb.BuildpackSpec) (biome.Env
if _, err := biome.EvalSymlinks(ctx, sys.Biome, rubyBuildDir); err != nil {
log.Debugf(ctx, "ruby-build not found: %v", err)
log.Infof(ctx, "Installing ruby-build plugin in %s", rubyBuildDir)
err := extract(ctx, sys, rubyBuildDir, "https://github.com/rbenv/ruby-build/archive/v20201118.zip", stripTopDirectory)
err := extract(ctx, sys, rubyBuildDir, "https://github.com/rbenv/ruby-build/archive/v20210423.zip", stripTopDirectory)
if err != nil {
return biome.Environment{}, fmt.Errorf("download ruby-build plugin: %w", err)
}
}

buildEnv := map[string]string{"RBENV_ROOT": rbenvDir}
// Special bits for older Ruby on M1
if desc.OS == biome.MacOS && desc.Arch == biome.ARM64 {
log.Debugf(ctx, "Setting RUBY_CFLAGS=-DUSE_FFI_CLOSURE_ALLOC to support Apple M1 with older Ruby versions")
buildEnv["RUBY_CFLAGS"] = "-DUSE_FFI_CLOSURE_ALLOC"
}
err := sys.Biome.Run(ctx, &biome.Invocation{
Argv: []string{"rbenv", "install", spec.Version()},
Env: biome.Environment{
Vars: map[string]string{"RBENV_ROOT": rbenvDir},
Vars: buildEnv,
PrependPath: []string{
sys.Biome.JoinPath(rbenvDir, "bin"),
},
Expand Down