forked from pool/julia
f7c9eecdd9
* libblastrampoline-hardcoded-libs.patch * libgit2-libssh2-hardcoded-libs.patch * mbedtls-hardcoded-libs.patch - Slight adjustment of specfile for updated patch OBS-URL: https://build.opensuse.org/package/show/science/julia?expand=0&rev=161
148 lines
5.3 KiB
Diff
148 lines
5.3 KiB
Diff
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/stdlib/LibGit2_jll/src/LibGit2_jll.jl b/stdlib/LibGit2_jll/src/LibGit2_jll.jl
|
|
index f0d4b5dda6..2ed3017b51 100644
|
|
--- a/stdlib/LibGit2_jll/src/LibGit2_jll.jl
|
|
+++ b/stdlib/LibGit2_jll/src/LibGit2_jll.jl
|
|
@@ -23,7 +23,7 @@ if Sys.iswindows()
|
|
elseif Sys.isapple()
|
|
const libgit2 = "@rpath/libgit2.1.5.dylib"
|
|
else
|
|
- const libgit2 = "libgit2.so.1.5"
|
|
+ const libgit2 = "libgit2.so"
|
|
end
|
|
|
|
function __init__()
|
|
diff --git a/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl b/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl
|
|
index 215de8aed6..918d1ffdc2 100644
|
|
--- a/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl
|
|
+++ b/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl
|
|
@@ -22,7 +22,7 @@ if Sys.iswindows()
|
|
elseif Sys.isapple()
|
|
const libopenlibm = "@rpath/libopenlibm.4.dylib"
|
|
else
|
|
- const libopenlibm = "libopenlibm.so.4"
|
|
+ const libopenlibm = "libopenlibm.so"
|
|
end
|
|
|
|
function __init__()
|
|
diff --git a/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl b/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl
|
|
index 2940970cef..359dbd9065 100644
|
|
--- a/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl
|
|
+++ b/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl
|
|
@@ -67,18 +67,18 @@ elseif Sys.isapple()
|
|
const libsuitesparseconfig = "@rpath/libsuitesparseconfig.5.dylib"
|
|
const libumfpack = "@rpath/libumfpack.5.dylib"
|
|
else
|
|
- const libamd = "libamd.so.2"
|
|
- const libbtf = "libbtf.so.1"
|
|
- const libcamd = "libcamd.so.2"
|
|
- const libccolamd = "libccolamd.so.2"
|
|
- const libcholmod = "libcholmod.so.3"
|
|
- const libcolamd = "libcolamd.so.2"
|
|
- const libklu = "libklu.so.1"
|
|
- const libldl = "libldl.so.2"
|
|
- const librbio = "librbio.so.2"
|
|
- const libspqr = "libspqr.so.2"
|
|
- const libsuitesparseconfig = "libsuitesparseconfig.so.5"
|
|
- const libumfpack = "libumfpack.so.5"
|
|
+ const libamd = "libamd.so"
|
|
+ const libbtf = "libbtf.so"
|
|
+ const libcamd = "libcamd.so"
|
|
+ const libccolamd = "libccolamd.so"
|
|
+ const libcholmod = "libcholmod.so"
|
|
+ const libcolamd = "libcolamd.so"
|
|
+ const libklu = "libklu.so"
|
|
+ const libldl = "libldl.so"
|
|
+ const librbio = "librbio.so"
|
|
+ const libspqr = "libspqr.so"
|
|
+ const libsuitesparseconfig = "libsuitesparseconfig.so"
|
|
+ const libumfpack = "libumfpack.so"
|
|
end
|
|
|
|
function __init__()
|
|
diff -ruN julia-1.9.4.orig/stdlib/LibSSH2_jll/Manifest.toml julia-1.9.4/stdlib/LibSSH2_jll/Manifest.toml
|
|
--- julia-1.9.4.orig/stdlib/LibSSH2_jll/Manifest.toml 1970-01-01 08:00:00.000000000 +0800
|
|
+++ julia-1.9.4/stdlib/LibSSH2_jll/Manifest.toml 2023-12-25 16:21:10.958808055 +0800
|
|
@@ -0,0 +1,16 @@
|
|
+# This file is machine-generated - editing it directly is not advised
|
|
+
|
|
+julia_version = "1.9.4"
|
|
+manifest_format = "2.0"
|
|
+project_hash = "c66714fa615224b41858a224953e27621bc6d231"
|
|
+
|
|
+[[deps.Artifacts]]
|
|
+uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
|
|
+
|
|
+[[deps.Libdl]]
|
|
+uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
|
|
+
|
|
+[[deps.MbedTLS_jll]]
|
|
+deps = ["Artifacts", "Libdl"]
|
|
+uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
|
|
+version = "2.28.2+0"
|
|
diff -ruN julia-1.9.4.orig/stdlib/LibSSH2_jll/src/LibSSH2_jll.jl julia-1.9.4/stdlib/LibSSH2_jll/src/LibSSH2_jll.jl
|
|
--- julia-1.9.4.orig/stdlib/LibSSH2_jll/src/LibSSH2_jll.jl 2023-12-11 08:55:02.868720503 +0800
|
|
+++ julia-1.9.4/stdlib/LibSSH2_jll/src/LibSSH2_jll.jl 2023-12-25 16:21:12.248810399 +0800
|
|
@@ -23,7 +23,7 @@
|
|
elseif Sys.isapple()
|
|
const libssh2 = "@rpath/libssh2.1.dylib"
|
|
else
|
|
- const libssh2 = "libssh2.so.1"
|
|
+ const libssh2 = "libssh2.so"
|
|
end
|
|
|
|
function __init__()
|
|
|
|
From: Soc Virnyl Estela <contact@uncomfyhalomacro.pl>
|
|
Date: Sat, 09 Dec 2023 16:30:31 +0800
|
|
Subject: Change hardcoded libs for libblastrampoline
|
|
|
|
---
|
|
|
|
diff -ruN julia-1.9.4.orig/stdlib/libblastrampoline_jll/src/libblastrampoline_jll.jl julia-1.9.4/stdlib/libblastrampoline_jll/src/libblastrampoline_jll.jl
|
|
--- julia-1.9.4.orig/stdlib/libblastrampoline_jll/src/libblastrampoline_jll.jl 2023-12-09 14:21:37.910096392 +0800
|
|
+++ julia-1.9.4/stdlib/libblastrampoline_jll/src/libblastrampoline_jll.jl 2023-12-09 14:21:58.006998468 +0800
|
|
@@ -24,7 +24,7 @@
|
|
elseif Sys.isapple()
|
|
"@rpath/libblastrampoline.5.dylib"
|
|
else
|
|
- "libblastrampoline.so.5"
|
|
+ "libblastrampoline.so"
|
|
end
|
|
|
|
function __init__()
|
|
From: Soc Virnyl Estela <contact@uncomfyhalomacro.pl>
|
|
Date: Sat, 09 Dec 2023 16:30:31 +0800
|
|
Subject: Modify hardcoded libs for mbedtls
|
|
|
|
---
|
|
|
|
diff -ruN julia-1.9.4.orig/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl julia/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
|
|
--- julia-1.9.4.orig/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl 2023-12-08 17:54:46.804532060 +0800
|
|
+++ julia/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl 2023-12-09 07:41:38.758431369 +0800
|
|
@@ -31,9 +31,9 @@
|
|
const libmbedtls = "@rpath/libmbedtls.14.dylib"
|
|
const libmbedx509 = "@rpath/libmbedx509.1.dylib"
|
|
else
|
|
- const libmbedcrypto = "libmbedcrypto.so.7"
|
|
- const libmbedtls = "libmbedtls.so.14"
|
|
- const libmbedx509 = "libmbedx509.so.1"
|
|
+ const libmbedcrypto = "libmbedcrypto.so"
|
|
+ const libmbedtls = "libmbedtls.so"
|
|
+ const libmbedx509 = "libmbedx509.so"
|
|
end
|
|
|
|
function __init__()
|