Skip to content
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

copy only aarch64-Linux from jruby 9.3.9.0 #15813

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

copy only aarch64-Linux from jruby 9.3.9.0 #15813

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4d7cbf
include aarch64 linux ffi
jsvd Jan 17, 2024
dbd3557
include aarch64 linux ffi
jsvd Jan 17, 2024
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: 5 additions & 2 deletions rubyUtils.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,11 @@ tasks.register("downloadAndInstallPreviousJRubyFFI", Copy) {
eachFile { f ->
f.path = f.path.replaceFirst("^jruby-${previousJRubyVersion}", '')
}
// Copy only the previous builds of libjffi that changed from JRuby 9.3.9.0 to 9.3.10.0
include "**/lib/jni/**/*"
// See https://github.com/jruby/jruby/issues/7579
// The aarch64 ffi binary broke for centos/oraclelinux 7 hhttps://github.com/jnr/jffi/issues/138
// For x86_64 Linux has been fixed in https://github.com/jnr/jffi/pull/140
// So we copy the Linux aarch64 build of libjffi that broke from JRuby 9.3.9.0 to 9.3.10.0
include "**/lib/jni/aarch64-Linux/*"

includeEmptyDirs = false
into "${projectDir}/vendor/jruby/tmp"
Expand Down