diff options
Diffstat (limited to 'gnu/packages/patches')
3 files changed, 3 insertions, 74 deletions
diff --git a/gnu/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch b/gnu/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch index b60f284923..c6ca48fff0 100644 --- a/gnu/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch +++ b/gnu/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch @@ -8,15 +8,16 @@ Patch by Nicoló Balzarotti <nicolo@nixo.xyz>. --- a/base/loading.jl +++ b/base/loading.jl -@@ -807,7 +807,10 @@ - path = normpath(joinpath(dirname(prev), _path)) +@@ -1131,7 +1131,10 @@ function _include_dependency(mod::Module, _path::AbstractString) end if _track_dependencies[] + @lock require_lock begin - push!(_require_dependencies, (mod, path, mtime(path))) + push!(_require_dependencies, + (mod, path, + haskey(ENV, "SOURCE_DATE_EPOCH") ? + parse(Float64, ENV["SOURCE_DATE_EPOCH"]) : mtime(path))) + end end return path, prev end diff --git a/gnu/packages/patches/julia-allow-parallel-build.patch b/gnu/packages/patches/julia-allow-parallel-build.patch deleted file mode 100644 index cc1d42fee4..0000000000 --- a/gnu/packages/patches/julia-allow-parallel-build.patch +++ /dev/null @@ -1,32 +0,0 @@ -Allow parallel tests with isolated environment. - -See https://github.com/JuliaLang/julia/issues/43205 and -https://github.com/JuliaLang/julia/pull/43211. - -diff --git a/test/runtests.jl b/test/runtests.jl -index 2f9cd058bb..150395e78c 100644 ---- a/test/runtests.jl -+++ b/test/runtests.jl -@@ -4,7 +4,7 @@ using Test - using Distributed - using Dates - import REPL --using Printf: @sprintf -+using Printf: @sprintf, @printf - using Base: Experimental - - include("choosetests.jl") -@@ -83,11 +83,12 @@ prepend!(tests, linalg_tests) - import LinearAlgebra - cd(@__DIR__) do - n = 1 -- if net_on -+ if net_on || haskey(ENV, "JULIA_CPU_THREADS") - n = min(Sys.CPU_THREADS, length(tests)) - n > 1 && addprocs_with_testenv(n) - LinearAlgebra.BLAS.set_num_threads(1) - end -+ @printf("Number of threads: %i\n", n) - skipped = 0 - - @everywhere include("testdefs.jl") diff --git a/gnu/packages/patches/libunwind-julia-fix-GCC10-fno-common.patch b/gnu/packages/patches/libunwind-julia-fix-GCC10-fno-common.patch deleted file mode 100644 index 8ef4b111e4..0000000000 --- a/gnu/packages/patches/libunwind-julia-fix-GCC10-fno-common.patch +++ /dev/null @@ -1,40 +0,0 @@ -Fix compilation with -fno-common. - -Borrowed from upstream 29e17d8d2ccbca07c423e3089a6d5ae8a1c9cb6e. -Author: Yichao Yu <yyc1992@gmail.com> -AuthorDate: Tue Mar 31 00:43:32 2020 -0400 -Commit: Dave Watson <dade.watson@gmail.com> -CommitDate: Tue Mar 31 08:06:29 2020 -0700 - -diff --git a/src/x86/Ginit.c b/src/x86/Ginit.c -index f6b8dc2..9550efa 100644 ---- a/src/x86/Ginit.c -+++ b/src/x86/Ginit.c -@@ -54,13 +54,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) - - # endif /* UNW_LOCAL_ONLY */ - --HIDDEN unw_dyn_info_list_t _U_dyn_info_list; -- --/* XXX fix me: there is currently no way to locate the dyn-info list -- by a remote unwinder. On ia64, this is done via a special -- unwind-table entry. Perhaps something similar can be done with -- DWARF2 unwind info. */ -- - static void - put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) - { -@@ -71,7 +64,12 @@ static int - get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, - void *arg) - { -- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; -+#ifndef UNW_LOCAL_ONLY -+# pragma weak _U_dyn_info_list_addr -+ if (!_U_dyn_info_list_addr) -+ return -UNW_ENOINFO; -+#endif -+ *dyn_info_list_addr = _U_dyn_info_list_addr (); - return 0; - } - |