Skip to content

[libcxxwrap] Rebuild using latest libjulia (for 1.13-DEV) #10441

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

Merged
merged 3 commits into from
Feb 6, 2025
Merged
Changes from all commits
Commits
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: 4 additions & 2 deletions L/libcxxwrap_julia/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ delete!(Pkg.Types.get_last_stdlibs(v"1.6.3"), uuid)
include("../../L/libjulia/common.jl")

name = "libcxxwrap_julia"
version = v"0.13.3"
version = v"0.13.4"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I now bumped the version here. However, this introduces a mismatch between the libcxxwrap version and the jll one.

I would leave it up to @barche to decide on how to deal with this.

Copy link
Member

Choose a reason for hiding this comment

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

yes. and in the meantime we can see whether it works for GAP_jll

Copy link
Contributor

Choose a reason for hiding this comment

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

I do think we should keep that version bump due to the JLLWrapper version bump from JuliaPackaging/BinaryBuilder.jl#1357. Otherwise this will change the compat for the existing release. See also JuliaRegistries/General#122129.

Copy link
Contributor

Choose a reason for hiding this comment

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

I will make a release for v0.13.4, identical to v0.13.3 except for the version number, so this PR will need to be updated with the new SHA once this is done.

Copy link
Contributor

Choose a reason for hiding this comment

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

Updated now, should be good to go after the rebuild.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks @barche! Looks good to me


git_repo = "https://github.com/JuliaInterop/libcxxwrap-julia.git"

# Collection of sources required to complete build
sources = [
GitSource(git_repo, "f7bb672a0e72437d7ab044e1950a62ae7dd3399b"),
GitSource(git_repo, "c47d1148355d30752aa772e03a2ac8078bb2d06b"),
]

# Bash recipe for building across all platforms
Expand Down Expand Up @@ -59,3 +59,5 @@ dependencies = [
# Build the tarballs, and possibly a `build.jl` as well.
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies;
preferred_gcc_version = v"10", julia_compat = "1.6")

# rebuild trigger: 1
Copy link
Member

Choose a reason for hiding this comment

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

I don't think a mere rebuild is sufficient as we added a new platform variant and thus the .jl files changed, so I think a new package version is needed...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The version of the jll is tightly coupled with https://github.com/JuliaInterop/libcxxwrap-julia, so I don't know if I can just bump the version here. Maybe @barche could comment on this.

But as just mentioned in #10439 (comment), I don't think we need a version bump at all here. (But I could be wrong)

Copy link
Member

Choose a reason for hiding this comment

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

OK, it is quite possible I am wrong. I am happy to just try it, in the worst case we have to just run another round of updates

Copy link
Contributor

@benlorenz benlorenz Feb 5, 2025

Choose a reason for hiding this comment

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

It might work since the new platform is excluded via libjulia common.jl but I am not totally sure. So probably better to bump the version.
(Edit: For some reason the above two comments weren't shown when I wrote this.)