diff options
Diffstat (limited to 'lang/julia/files')
4 files changed, 24 insertions, 18 deletions
diff --git a/lang/julia/files/patch-Makefile b/lang/julia/files/patch-Makefile index 1248a6e671cf..d294118b6f98 100644 --- a/lang/julia/files/patch-Makefile +++ b/lang/julia/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2021-11-30 12:13:06 UTC +--- Makefile.orig 2022-05-18 05:08:54 UTC +++ Makefile @@ -226,7 +226,7 @@ define stringreplace endef @@ -31,7 +31,7 @@ # Update RPATH entries and JL_SYSTEM_IMAGE_PATH if $(private_libdir_rel) != $(build_private_libdir_rel) ifneq ($(private_libdir_rel),$(build_private_libdir_rel)) -@@ -384,26 +376,15 @@ ifeq ($(BUNDLE_DEBUG_LIBS),1) +@@ -386,26 +378,15 @@ ifeq ($(BUNDLE_DEBUG_LIBS),1) endif endif diff --git a/lang/julia/files/patch-deps_llvm.mk b/lang/julia/files/patch-deps_llvm.mk new file mode 100644 index 000000000000..a8e5ad8efe61 --- /dev/null +++ b/lang/julia/files/patch-deps_llvm.mk @@ -0,0 +1,11 @@ +--- deps/llvm.mk.orig 2022-05-18 05:08:54 UTC ++++ deps/llvm.mk +@@ -277,7 +277,7 @@ $(eval $(call LLVM_PATCH,llvm7-symver-jlprefix)) + endif + + # declare that all patches must be applied before running ./configure +-$(LLVM_BUILDDIR_withtype)/build-configured: | $(LLVM_PATCH_PREV) $(build_prefix)/manifest/zlib ++$(LLVM_BUILDDIR_withtype)/build-configured: | $(LLVM_PATCH_PREV) + + $(LLVM_BUILDDIR_withtype)/build-configured: $(SRCCACHE)/$(LLVM_SRC_DIR)/source-extracted | $(llvm_python_workaround) + mkdir -p $(dir $@) diff --git a/lang/julia/files/patch-stdlib_Downloads-26d79afcde9cf837a331fce023b31f1d3699700c_src_Curl_Multi.jl b/lang/julia/files/patch-stdlib_Downloads-26d79afcde9cf837a331fce023b31f1d3699700c_src_Curl_Multi.jl deleted file mode 100644 index da0227e7c083..000000000000 --- a/lang/julia/files/patch-stdlib_Downloads-26d79afcde9cf837a331fce023b31f1d3699700c_src_Curl_Multi.jl +++ /dev/null @@ -1,16 +0,0 @@ ---- stdlib/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c/src/Curl/Multi.jl.orig 2021-10-26 22:48:36 UTC -+++ stdlib/Downloads-26d79afcde9cf837a331fce023b31f1d3699700c/src/Curl/Multi.jl -@@ -142,12 +142,7 @@ function timer_callback( - )::Cint - multi = unsafe_pointer_to_objref(multi_p)::Multi - @assert multi_h == multi.handle -- if timeout_ms == 0 -- lock(multi.lock) do -- @check curl_multi_socket_action(multi.handle, CURL_SOCKET_TIMEOUT, 0) -- check_multi_info(multi) -- end -- elseif timeout_ms >= 0 -+ if timeout_ms >= 0 - timeout_cb = @cfunction(timeout_callback, Cvoid, (Ptr{Cvoid},)) - uv_timer_start(multi.timer, timeout_cb, max(1, timeout_ms), 0) - elseif timeout_ms == -1 diff --git a/lang/julia/files/patch-stdlib_Zlib__jll_src_Zlib__jll.jl b/lang/julia/files/patch-stdlib_Zlib__jll_src_Zlib__jll.jl new file mode 100644 index 000000000000..65523f1da6b4 --- /dev/null +++ b/lang/julia/files/patch-stdlib_Zlib__jll_src_Zlib__jll.jl @@ -0,0 +1,11 @@ +--- stdlib/Zlib_jll/src/Zlib_jll.jl.orig 2022-05-16 12:16:57 UTC ++++ stdlib/Zlib_jll/src/Zlib_jll.jl +@@ -22,7 +22,7 @@ if Sys.iswindows() + elseif Sys.isapple() + const libz = "@rpath/libz.1.dylib" + else +- const libz = "libz.so.1" ++ const libz = "libz.so" + end + + function __init__() |