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 libjulia for latest master #5934

Merged
merged 1 commit into from
Nov 30, 2022

Conversation

fingolfin
Copy link
Member

Julia PR #44527 changes how foreign types work. To accommodate this, we need a new libjulia_jll

I think this PR is meant to be backported to the release-1.9 branch. At that point, another update of libjulia_jll will be needed. But I am not sure when this backport will happen, and so I'd like to just move ahead with this now, so that I can un-break our CI tests against Julia nightly.

BTW, I've updated the version for libjulia_jll here. In the past we didn't always do that. I am not really sure if I am "supposed" to increment the version, or supposed to not do that and just add a whitespace to force a rebuild... I don't mind either way... shrug

@vchuravy
Copy link
Member

I would strongly prefer the jll version to match the actual Julia version... otherwise things get confusing.

@fingolfin
Copy link
Member Author

But what is the "actual julia version" given that this ships 1.6 - 1.10 in various variants :-)

@vchuravy
Copy link
Member

Oh right... Morning brain

@fingolfin
Copy link
Member Author

Perhaps it should be the maximum of all versions, so here still 1.10 ? Whatever we agree on (or agreeD ON -- I probably just forgot the outcome) I suggest we add it as a comment to avoid repeating the discussion needlessly:-)

@fingolfin
Copy link
Member Author

Hrm, 1.9 fails in mingw, and 1.10 fails everywhere:

[11:59:22] make[2]: *** No rule to make target '/workspace/srcdir/julia/src/support/hashing.o', needed by '/workspace/srcdir/julia/src/support/libsupport.a'.  Stop.
[11:59:22] make[2]: Leaving directory '/workspace/srcdir/julia/src/support'
[11:59:22] make[1]: *** [Makefile:329: support/libsupport.a] Error 2
[11:59:22] make[1]: Leaving directory '/workspace/srcdir/julia/src'
[11:59:22] make: *** [Makefile:62: julia_flisp.boot.inc.phony] Error 2
[11:59:22] make: *** Waiting for unfinished jobs....

@fingolfin
Copy link
Member Author

OK, I went one commit back, leaving out Julia commit JuliaLang/julia@41b73e2 ("Bump libuv"). That resolves the 1.10 builds for now.

That leaves the failing mingw builds.

@benlorenz
Copy link
Contributor

That leaves the failing mingw builds.

Once again it is that msys patch that is not applied since the julia version changed from 1.9.0-DEV to 1.9.0-alpha1 which doesn't match the folder name anymore. Instead of the patch we might also try to remove the fake uname at the beginning of the build:

rm -f /usr/bin/uname

(This reports that it is running in an MSY2 shell instead of a Linux build-os)

But I can't test this right now since for some reason I am hitting that

*** No rule to make target '/workspace/srcdir/julia/src/support/hashing.o', needed by '/workspace/srcdir/julia/src/support/libsupport.a'.

locally, even with the current Yggdrasil master instead of the updates from this branch.

Julia PR #44527 changes how foreign types work. To accommodate this, we need a
new libjulia_jll.
@fingolfin
Copy link
Member Author

Once again it is that msys patch that is not applied since the julia version changed from 1.9.0-DEV to 1.9.0-alpha1

Urgh, one would think I'd have learned that by now :-(. Thank you, trying that now.

Assuming this works, I'd like to merge and then try the "remove fake uname" trick in a separate PR (it would be nice to not require those patches)

@fingolfin fingolfin merged commit 39774d6 into JuliaPackaging:master Nov 30, 2022
@fingolfin fingolfin deleted the mh/libjulia branch November 30, 2022 17:25
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