rpm/julia
SHA256
1
0
Fork 0
forked from pool/julia
Code Pull Requests Activity

- Add libgit2-libssh2-hardcoded-libs.patch

Browse Source 
- Slight adjustment of specfile for new patch

OBS-URL: https://build.opensuse.org/package/show/science/julia?expand=0&rev=160
This commit is contained in:
Soc Virnyl Estela 2023-12-25 08:26:03 +00:00 committed by Git OBS Bridge
parent 1c685c49b5
commit 83f04e8ac4
3 changed files with 83 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
julia.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Dec 25 08:25:12 UTC 2023 - Soc Virnyl Estela <uncomfy+openbuildservice@uncomfyhalomacro.pl>
- Add libgit2-libssh2-hardcoded-libs.patch
- Slight adjustment of specfile for new patch
-------------------------------------------------------------------
Tue Dec 19 02:34:10 UTC 2023 - Soc Virnyl Estela <uncomfy+openbuildservice@uncomfyhalomacro.pl>

9
julia.spec
View File

@ -70,6 +70,7 @@ Patch12: llvm-link-shared.patch
Patch13: julia-hardcoded-libs.patch
Patch14: mbedtls-hardcoded-libs.patch
Patch15: libblastrampoline-hardcoded-libs.patch
Patch16: libgit2-libssh2-hardcoded-libs.patch
BuildRequires: arpack-ng-devel >= 3.3.0
BuildRequires: blas-devel
BuildRequires: ca-certificates
@ -133,9 +134,12 @@ Requires: libnghttp2.so.14
# Same as the previous comment. But the difference
# is that we applied julia-hardcoded-libs.patch
# so therefore it is needed
# and other hardcode patches
# so therefore they are needed
Requires: libblastrampoline-devel
Requires: libgit2-devel
Requires: libnghttp2-devel
Requires: libssh2-devel
Requires: openlibm-devel
Requires: suitesparse-devel
@ -233,11 +237,14 @@ patch -p1 -i %{PATCH6}
patch -p1 -i %{PATCH8}
# Make.inc puts it in the wrong libpath
# patch -p1 -i %%{PATCH10}
# Other hardcoded libs patch
patch -p1 -i %{PATCH11}
patch -p1 -i %{PATCH12}
patch -p1 -i %{PATCH13}
patch -p1 -i %{PATCH14}
patch -p1 -i %{PATCH15}
patch -p1 -i %{PATCH16}
%ifarch aarch64 %{arm}
# https://github.com/JuliaLang/julia/issues/41613#issuecomment-976535193

69
libgit2-libssh2-hardcoded-libs.patch Normal file
View File

@ -0,0 +1,69 @@
diff -ruN julia-1.9.4.orig/stdlib/LibGit2_jll/Manifest.toml julia-1.9.4/stdlib/LibGit2_jll/Manifest.toml
--- julia-1.9.4.orig/stdlib/LibGit2_jll/Manifest.toml 1970-01-01 08:00:00.000000000 +0800
+++ julia-1.9.4/stdlib/LibGit2_jll/Manifest.toml 2023-12-25 16:20:55.192112751 +0800
@@ -0,0 +1,21 @@
+# This file is machine-generated - editing it directly is not advised
+
+julia_version = "1.9.4"
+manifest_format = "2.0"
+project_hash = "c12a1c9353f7a90c1f1357dda62699fa191fe6db"
+
+[[deps.Artifacts]]
+uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
+
+[[deps.LibSSH2_jll]]
+deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
+uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
+version = "1.11.0+1"
+
+[[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/LibGit2_jll/src/LibGit2_jll.jl julia-1.9.4/stdlib/LibGit2_jll/src/LibGit2_jll.jl
--- julia-1.9.4.orig/stdlib/LibGit2_jll/src/LibGit2_jll.jl 2023-12-11 08:55:02.858720499 +0800
+++ julia-1.9.4/stdlib/LibGit2_jll/src/LibGit2_jll.jl 2023-12-25 16:20:59.245453447 +0800
@@ -23,7 +23,7 @@
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 -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__()