From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- .../files/julia-1.6.0-fix-hardcoded-libs.patch | 43 ---------------------- dev-lang/julia/files/julia-1.6.3-glibc-2.34.patch | 32 ---------------- 2 files changed, 75 deletions(-) delete mode 100644 dev-lang/julia/files/julia-1.6.0-fix-hardcoded-libs.patch delete mode 100644 dev-lang/julia/files/julia-1.6.3-glibc-2.34.patch (limited to 'dev-lang/julia/files') diff --git a/dev-lang/julia/files/julia-1.6.0-fix-hardcoded-libs.patch b/dev-lang/julia/files/julia-1.6.0-fix-hardcoded-libs.patch deleted file mode 100644 index 1d184c3dbb54..000000000000 --- a/dev-lang/julia/files/julia-1.6.0-fix-hardcoded-libs.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl -index a7ca666b23..b84a42f4e7 100644 ---- a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl -+++ b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl -@@ -31,9 +31,9 @@ elseif Sys.isapple() - const libmbedtls = "@rpath/libmbedtls.13.dylib" - const libmbedx509 = "@rpath/libmbedx509.1.dylib" - else -- const libmbedcrypto = "libmbedcrypto.so.5" -- const libmbedtls = "libmbedtls.so.13" -- const libmbedx509 = "libmbedx509.so.1" -+ const libmbedcrypto = "libmbedcrypto.so" -+ const libmbedtls = "libmbedtls.so" -+ const libmbedx509 = "libmbedx509.so" - end - - function __init__() -diff --git a/stdlib/libLLVM_jll/src/libLLVM_jll.jl b/stdlib/libLLVM_jll/src/libLLVM_jll.jl -index fa45e754e5..b51812e3a8 100644 ---- a/stdlib/libLLVM_jll/src/libLLVM_jll.jl -+++ b/stdlib/libLLVM_jll/src/libLLVM_jll.jl -@@ -23,7 +23,7 @@ if Sys.iswindows() - elseif Sys.isapple() - const libLLVM = "@rpath/libLLVM.dylib" - else -- const libLLVM = "libLLVM-11jl.so" -+ const libLLVM = "libLLVM.so" - end - - function __init__() -diff --git a/stdlib/nghttp2_jll/src/nghttp2_jll.jl b/stdlib/nghttp2_jll/src/nghttp2_jll.jl -index 8b98c76ac5..77ad9e3800 100644 ---- a/stdlib/nghttp2_jll/src/nghttp2_jll.jl -+++ b/stdlib/nghttp2_jll/src/nghttp2_jll.jl -@@ -22,7 +22,7 @@ if Sys.iswindows() - elseif Sys.isapple() - const libnghttp2 = "@rpath/libnghttp2.14.dylib" - else -- const libnghttp2 = "libnghttp2.so.14" -+ const libnghttp2 = "libnghttp2.so" - end - - function __init__() diff --git a/dev-lang/julia/files/julia-1.6.3-glibc-2.34.patch b/dev-lang/julia/files/julia-1.6.3-glibc-2.34.patch deleted file mode 100644 index 3e3146529aea..000000000000 --- a/dev-lang/julia/files/julia-1.6.3-glibc-2.34.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://github.com/JuliaLang/julia/commit/09a49c6b57fbde109f0f0c2aa9aa05cef2c1dd40 -https://bugs.gentoo.org/824486 - -From: t-bltg <13423344+t-bltg@users.noreply.github.com> -Date: Thu, 12 Aug 2021 21:36:18 +0200 -Subject: [PATCH] MINSIGSTKSZ is no longer constant in glibc (#41860) - -MINSIGSTKSZ is redefined to sysconf(_SC_MINSIGSTKSZ) starting from glibc 2.34 - -Co-authored-by: t-bltg -(cherry picked from commit f19b9a20dde2688c642b7dd709b5d9446e4df2f6) ---- a/src/task.c -+++ b/src/task.c -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - #include - #include "julia.h" -@@ -75,8 +76,8 @@ static inline void tsan_switch_to_ctx(jl_ucontext_t *ctx) {} - - // empirically, jl_finish_task needs about 64k stack space to infer/run - // and additionally, gc-stack reserves 64k for the guard pages --#if defined(MINSIGSTKSZ) && MINSIGSTKSZ > 131072 --#define MINSTKSZ MINSIGSTKSZ -+#if defined(MINSIGSTKSZ) -+#define MINSTKSZ (MINSIGSTKSZ > 131072 ? MINSIGSTKSZ : 131072) - #else - #define MINSTKSZ 131072 - #endif -- cgit v1.2.3