forked from pool/julia
- Combine these patches to julia-hardcoded-libs.patch and delete:
* 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
This commit is contained in:
Soc Virnyl Estela
Git OBS Bridge
parent
83f04e8ac4
commit
f7c9eecdd9
@ -71,4 +71,77 @@ index 2940970cef..359dbd9065 100644
|
||||
+ 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__()
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
- Combine these patches to julia-hardcoded-libs.patch and delete:
|
||||
* libblastrampoline-hardcoded-libs.patch
|
||||
* libgit2-libssh2-hardcoded-libs.patch
|
||||
* mbedtls-hardcoded-libs.patch
|
||||
- Slight adjustment of specfile for updated patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 19 02:34:10 UTC 2023 - Soc Virnyl Estela <uncomfy+openbuildservice@uncomfyhalomacro.pl>
|
||||
|
||||
12
julia.spec
12
julia.spec
@ -68,9 +68,6 @@ Patch12: llvm-link-shared.patch
|
||||
# Adapted from https://gitlab.archlinux.org/archlinux/packaging/packages/julia/-/raw/main/julia-hardcoded-libs.patch?ref_type=heads
|
||||
# We just remove the julia specific llvm sofile change
|
||||
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
|
||||
@ -134,9 +131,6 @@ Requires: libnghttp2.so.14
|
||||
|
||||
# Same as the previous comment. But the difference
|
||||
# is that we applied julia-hardcoded-libs.patch
|
||||
# and other hardcode patches
|
||||
# so therefore they are needed
|
||||
Requires: libblastrampoline-devel
|
||||
Requires: libgit2-devel
|
||||
Requires: libnghttp2-devel
|
||||
Requires: libssh2-devel
|
||||
@ -242,9 +236,6 @@ patch -p1 -i %{PATCH8}
|
||||
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
|
||||
@ -305,9 +296,6 @@ export CFLAGS="%{optflags}"
|
||||
export CXXFLAGS="%{optflags}"
|
||||
export LD_LIBRARY_PATH=%{_builddir}/%{buildsubdir}/build/usr/lib:%{_builddir}/%{buildsubdir}/build%{_libdir}:%{_builddir}/%{buildsubdir}/usr/lib
|
||||
|
||||
pushd deps
|
||||
export BUILDDIR="%{_builddir}/%{buildsubdir}/build"
|
||||
export USE_BLAS64=1
|
||||
export USE_BINARYBUILDER_OPENBLAS=0
|
||||
export OPENBLAS_LIBNAMESUFFIX="%{?__isa_bits}_"
|
||||
export OPENBLAS_SYMBOLSUFFIX="%{?__isa_bits}_"
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
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__()
|
||||
@ -1,69 +0,0 @@
|
||||
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__()
|
||||
@ -1,22 +0,0 @@
|
||||
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__()
|
||||
Loading…
Reference in New Issue
Block a user