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

[libjulia] update 1.11-DEV to latest master, update 1.10 to beta2 #7283

Merged
merged 1 commit into from
Sep 5, 2023

Conversation

benlorenz
Copy link
Contributor

@benlorenz benlorenz commented Sep 4, 2023

To prepare for rebuilds to fix small_typeof errors, see JuliaInterop/CxxWrap.jl#368:

libcxxwrap_julia.so: undefined symbol: small_typeof, version JL_LIBJULIA_1.11

This includes the patch from JuliaLang/julia#51172 to remove the native flag.

We might want to wait a bit with this to also rebuild 1.10 in one go once JuliaLang/julia#50892 is backported?
I have updated it to 1.10.0-beta2 for now to see if there are any other errors but he small_typeof change is not included yet.

cc: @fingolfin @barche

closes #7043

to prepare for rebuilds to fix small_typeof errors
Copy link
Member

@fingolfin fingolfin left a comment

Choose a reason for hiding this comment

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

Fine by me. Thanks!

As to waiting for JuliaLang/julia#50892 to be backported: I think that will happen shortly before 1.10beta3 is made, no? It seems difficult to predict when exactly it'll happen then? Probably within the next 1-4 weeks?

push!(dependencies, BuildDependency(get_addable_spec("SuiteSparse_jll", v"5.10.1+6")))
push!(dependencies, Dependency(get_addable_spec("LibUV_jll", v"2.0.1+13")))
push!(dependencies, Dependency(get_addable_spec("LibUnwind_jll", v"1.5.0+4"); platforms=filter(!Sys.isapple, platforms)))
push!(dependencies, BuildDependency(get_addable_spec("SuiteSparse_jll", v"7.2.0+1")))
Copy link
Member

Choose a reason for hiding this comment

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

So this subsumes PR #7043 by @ViralBShah (perhaps add closes #7043?)

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 wasn't aware of that PR but yes this is included now and seems to work with 7.2.0+1, an updated CMake version and a small adjustment for the libblastrampoline filename in the suitesparse build file.

@barche
Copy link
Contributor

barche commented Sep 4, 2023

Thanks, for me it would be fine to let this go through now. Not sure why it fails here though:

[09:57:44] ./loader_trampolines.o: file not recognized: File truncated
[09:57:44] collect2: error: ld returned 1 exit status</span>

@benlorenz benlorenz marked this pull request as ready for review September 4, 2023 13:59
@benlorenz
Copy link
Contributor Author

Thanks, for me it would be fine to let this go through now. Not sure why it fails here though:

[09:57:44] ./loader_trampolines.o: file not recognized: File truncated
[09:57:44] collect2: error: ld returned 1 exit status</span>

Not sure either, but I am quite sure that I have seen this error before, maybe the restart will help.

@benlorenz
Copy link
Contributor Author

Fine by me. Thanks!

As to waiting for JuliaLang/julia#50892 to be backported: I think that will happen shortly before 1.10beta3 is made, no? It seems difficult to predict when exactly it'll happen then? Probably within the next 1-4 weeks?

I marked it as ready now, I guess we can go ahead, especially since we need to rebuild all the libcxxwrap-dependent packages anyway for the new version.

With some luck a rebuild of libcxxwrap is sufficient to fix the issues once the small_typeof PR is backported to 1.10 (instead of rebuilding all downstream packages).

@benlorenz benlorenz marked this pull request as draft September 4, 2023 19:37
@benlorenz benlorenz marked this pull request as ready for review September 4, 2023 19:37
@barche
Copy link
Contributor

barche commented Sep 5, 2023

For me this is OK, shall we merge it @fingolfin ?

@fingolfin fingolfin merged commit 0ee97c4 into JuliaPackaging:master Sep 5, 2023
benlorenz added a commit to benlorenz/Yggdrasil that referenced this pull request Oct 4, 2023
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.

3 participants