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.

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

Update ccalls in info_cachefile to Julia upstream changes #31

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

Conversation

fatteneder
Copy link
Contributor

The following PRs have added extra arguments to two C methods that are used by info_cachefile, which this PR fixes.

- JuliaLang/julia#52123: Added the
  `int ignore_native` argument to jl_restore_package_image_from_file
- JuliaLang/julia#49538: Added the
  `const char *pkgname` argument to jl_restore_package_image_from_file
  and jl_restore_incremental.
@@ -182,9 +182,19 @@ end

function info_cachefile(pkg::PkgId, path::String, depmods::Vector{Any}, isocache::Bool=false)
if isocache
sv = ccall(:jl_restore_package_image_from_file, Any, (Cstring, Any, Cint), path, depmods, true)
@static if VERSION >= v"1.11.0-DEV.922" # https://github.com/JuliaLang/julia/pull/52123
sv = ccall(:jl_restore_package_image_from_file, Any, (Cstring, Any, Cint, Cstring, Cint), path, depmods, true, pkg.name, false)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@IanButterworth Is using ignore_native = false for the last argument correct?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant