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.

Sign up for GitHub

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] add or update 1.12-DEV, 1.11-DEV, 1.10 #8151

Merged
merged 5 commits into from
Feb 23, 2024
Merged

[libjulia] add or update 1.12-DEV, 1.11-DEV, 1.10 #8151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ac228b0
[libjulia] add or update 1.12-DEV, 1.11-DEV, 1.10
fingolfin Feb 22, 2024
5b45e5f
fix sha
benlorenz Feb 22, 2024
730aad9
Hardcode more dependency versions
fingolfin Feb 22, 2024
ba04591
Add potential patches for loader_trampolines race
fingolfin Feb 22, 2024
dd2f7be
Try darwin workaround
fingolfin Feb 23, 2024
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 L/libjulia/build_tarballs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function Pkg.Types.is_stdlib(uuid::Base.UUID, julia_version::VersionNumber)
return false
end

jllversion=v"1.10.8"
jllversion=v"1.10.9"
Copy link
Member Author

Choose a reason for hiding this comment

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

Should this be 1.11? 1.12? It's not clear to me given that 1.10.8 already contained 1.11-dev... Huh

Copy link
Contributor

Choose a reason for hiding this comment

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

I think at some point we gave up with this number and just kept bumping the patch version. Since it is only used as BuildDependency there is no need for compat statements anyway.
Those packages that need a specific version just fix that exact version and that's about it.

for ver in julia_full_versions
build_julia(ARGS, ver; jllversion)
end
38 changes: 38 additions & 0 deletions L/libjulia/bundled/patches/1.10.0/loader_trampolines.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
From 286b7ba8a36fbe0ea29c599f629dfa7e6b855133 Mon Sep 17 00:00:00 2001
From: Max Horn <[email protected]>
Date: Thu, 22 Feb 2024 17:42:02 +0100
Subject: [PATCH] Add debug variant of loader_trampolines.o

This prevents a race condition when building 'julia-cli-debug
julia-cli-release' simultaneously (as we do for libjulia_jll, and
also generally seems appropriate given what is done for all other
source files.
---
cli/Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cli/Makefile b/cli/Makefile
index c72ebff2b9..4e32c53b9a 100644
--- a/cli/Makefile
+++ b/cli/Makefile
@@ -48,7 +48,7 @@ LIB_DOBJS := $(BUILDDIR)/loader_lib.dbg.obj
# If this is an architecture that supports dynamic linking, link in a trampoline definition
ifneq (,$(wildcard $(SRCDIR)/trampolines/trampolines_$(ARCH).S))
LIB_OBJS += $(BUILDDIR)/loader_trampolines.o
-LIB_DOBJS += $(BUILDDIR)/loader_trampolines.o
+LIB_DOBJS += $(BUILDDIR)/loader_trampolines.dbg.obj
endif

default: release
@@ -65,6 +65,8 @@ $(BUILDDIR)/loader_exe.dbg.obj : $(SRCDIR)/loader_exe.c $(HEADERS) $(JULIAHOME)/
@$(call PRINT_CC, $(CC) $(DEBUGFLAGS) $(LOADER_CFLAGS) -c $< -o $@)
$(BUILDDIR)/loader_trampolines.o : $(SRCDIR)/trampolines/trampolines_$(ARCH).S $(HEADERS) $(SRCDIR)/trampolines/common.h
@$(call PRINT_CC, $(CC) $(SHIPFLAGS) $(LOADER_CFLAGS) $< -c -o $@)
+$(BUILDDIR)/loader_trampolines.dbg.obj : $(SRCDIR)/trampolines/trampolines_$(ARCH).S $(HEADERS) $(SRCDIR)/trampolines/common.h
+ @$(call PRINT_CC, $(CC) $(DEBUGFLAGS) $(LOADER_CFLAGS) $< -c -o $@)

# Debugging target to help us see what kind of code is being generated for our trampolines
dump-trampolines: $(SRCDIR)/trampolines/trampolines_$(ARCH).S
--
2.43.2

Loading