Skip to content

[RootFS] Update CSL and Meson #11095

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion 0_RootFS/Rootfs/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ sources = [
"bf3f37ec29edcdb3e2a163edaf84aeece39f8c9d"), # v0.14.3
# We need a very recent version of meson to build gtk stuffs, so let's just grab the latest
GitSource("https://github.com/mesonbuild/meson.git",
"eaefe29463a61a311a6b1de6cd539f39500399ff"), # v1.4.0
"39be44fed2938ad03f8e2bc183401a121387bf50"), # v1.4.0
Copy link
Contributor

Choose a reason for hiding this comment

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

This is v1.8.0, the comment is wrong.

# We're going to bundle a version of `ldid` into the rootfs for now. When we split this up,
# we'll do this in a nicer way by using JLLs directly, but until then, this is what we've got.
ArchiveSource("https://github.com/JuliaBinaryWrappers/ldid_jll.jl/releases/download/ldid-v2.1.3%2B0/ldid.v2.1.3.x86_64-linux-musl-cxx11.tar.gz",
Expand Down
2 changes: 1 addition & 1 deletion 0_RootFS/Rootfs/bundled/libs/csl/download_csls.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1

# Download and extract the lib folders from our CompilerSupportLibraries_jll.jl releases
CSL_VERSION="0.5.1+0"
CSL_VERSION="1.3.1+0"
for arch in i686 x86_64; do
rm -rf glibc-${arch} musl-${arch}
mkdir -p glibc-${arch} musl-${arch}
Expand Down