Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop hardcoding SOVERSION for stdlibs #43223

Closed
wants to merge 3 commits into from
Closed

Stop hardcoding SOVERSION for stdlibs #43223

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f30b23f
Stop hardcoding SOVERSION for stdlibs
nalimilan Nov 25, 2021
7a21da3
Fix failures
nalimilan Nov 25, 2021
27f2c6c
Merge branch 'master' into nl/soversion
ViralBShah Feb 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions stdlib/GMP_jll/src/GMP_jll.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ libgmpxx_handle = C_NULL
libgmpxx_path = ""

if Sys.iswindows()
const libgmp = "libgmp-10.dll"
const libgmpxx = "libgmpxx-4.dll"
const libgmp = "libgmp.dll"
const libgmpxx = "libgmpxx.dll"
elseif Sys.isapple()
const libgmp = "@rpath/libgmp.10.dylib"
const libgmpxx = "@rpath/libgmpxx.4.dylib"
const libgmp = "@rpath/libgmp.dylib"
const libgmpxx = "@rpath/libgmpxx.dylib"
else
const libgmp = "libgmp.so.10"
const libgmpxx = "libgmpxx.so.4"
const libgmp = "libgmp.so"
const libgmpxx = "libgmpxx.so"
end

function __init__()
Expand Down
4 changes: 2 additions & 2 deletions stdlib/LibGit2_jll/src/LibGit2_jll.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ libgit2_path = ""
if Sys.iswindows()
const libgit2 = "libgit2.dll"
elseif Sys.isapple()
const libgit2 = "@rpath/libgit2.1.1.dylib"
const libgit2 = "@rpath/libgit2.dylib"
else
const libgit2 = "libgit2.so.1.1"
const libgit2 = "libgit2.so"
end

function __init__()
Expand Down
4 changes: 2 additions & 2 deletions stdlib/LibSSH2_jll/src/LibSSH2_jll.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ libssh2_path = ""
if Sys.iswindows()
const libssh2 = "libssh2.dll"
elseif Sys.isapple()
const libssh2 = "@rpath/libssh2.1.dylib"
const libssh2 = "@rpath/libssh2.dylib"
else
const libssh2 = "libssh2.so.1"
const libssh2 = "libssh2.so"
end

function __init__()
Expand Down
2 changes: 1 addition & 1 deletion stdlib/LibUV_jll/src/LibUV_jll.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if Sys.iswindows()
elseif Sys.isapple()
const libuv = "@rpath/libuv.2.dylib"
else
const libuv = "libuv.so.2"
const libuv = "libuv.so"
end
Comment on lines 23 to 27
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why, but on Windows only libuv-2.dll is in the ZIP, not libuv.dll like for other libraries. So I skipped it on Windows and Mac to avoid breaking something (I couldn't check Mac).


function __init__()
Expand Down
2 changes: 1 addition & 1 deletion stdlib/LibUnwind_jll/src/LibUnwind_jll.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ artifact_dir = ""
libunwind_handle = C_NULL
libunwind_path = ""

const libunwind = "libunwind.so.8"
const libunwind = "libunwind.so"

function __init__()
# We only do something on Linux/FreeBSD
Expand Down
6 changes: 3 additions & 3 deletions stdlib/MPFR_jll/src/MPFR_jll.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ libmpfr_handle = C_NULL
libmpfr_path = ""

if Sys.iswindows()
const libmpfr = "libmpfr-6.dll"
const libmpfr = "libmpfr.dll"
elseif Sys.isapple()
const libmpfr = "@rpath/libmpfr.6.dylib"
const libmpfr = "@rpath/libmpfr.dylib"
else
const libmpfr = "libmpfr.so.6"
const libmpfr = "libmpfr.so"
end

function __init__()
Expand Down
12 changes: 6 additions & 6 deletions stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ if Sys.iswindows()
const libmbedtls = "libmbedtls.dll"
const libmbedx509 = "libmbedx509.dll"
elseif Sys.isapple()
const libmbedcrypto = "@rpath/libmbedcrypto.5.dylib"
const libmbedtls = "@rpath/libmbedtls.13.dylib"
const libmbedx509 = "@rpath/libmbedx509.1.dylib"
const libmbedcrypto = "@rpath/libmbedcrypto.dylib"
const libmbedtls = "@rpath/libmbedtls.dylib"
const libmbedx509 = "@rpath/libmbedx509.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__()
Expand Down
4 changes: 2 additions & 2 deletions stdlib/OpenLibm_jll/src/OpenLibm_jll.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ libopenlibm_path = ""
if Sys.iswindows()
const libopenlibm = "libopenlibm.dll"
elseif Sys.isapple()
const libopenlibm = "@rpath/libopenlibm.3.dylib"
const libopenlibm = "@rpath/libopenlibm.dylib"
else
const libopenlibm = "libopenlibm.so.3"
const libopenlibm = "libopenlibm.so"
end

function __init__()
Expand Down
6 changes: 3 additions & 3 deletions stdlib/PCRE2_jll/src/PCRE2_jll.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ libpcre2_8_handle = C_NULL
libpcre2_8_path = ""

if Sys.iswindows()
const libpcre2_8 = "libpcre2-8-0.dll"
const libpcre2_8 = "libpcre2-8.dll"
elseif Sys.isapple()
const libpcre2_8 = "@rpath/libpcre2-8.0.dylib"
const libpcre2_8 = "@rpath/libpcre2-8.dylib"
else
const libpcre2_8 = "libpcre2-8.so.0"
const libpcre2_8 = "libpcre2-8.so"
end

function __init__()
Expand Down
48 changes: 24 additions & 24 deletions stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,31 +54,31 @@ if Sys.iswindows()
const libsuitesparseconfig = "libsuitesparseconfig.dll"
const libumfpack = "libumfpack.dll"
elseif Sys.isapple()
const libamd = "@rpath/libamd.2.dylib"
const libbtf = "@rpath/libbtf.1.dylib"
const libcamd = "@rpath/libcamd.2.dylib"
const libccolamd = "@rpath/libccolamd.2.dylib"
const libcholmod = "@rpath/libcholmod.3.dylib"
const libcolamd = "@rpath/libcolamd.2.dylib"
const libklu = "@rpath/libklu.1.dylib"
const libldl = "@rpath/libldl.2.dylib"
const librbio = "@rpath/librbio.2.dylib"
const libspqr = "@rpath/libspqr.2.dylib"
const libsuitesparseconfig = "@rpath/libsuitesparseconfig.5.dylib"
const libumfpack = "@rpath/libumfpack.5.dylib"
const libamd = "@rpath/libamd.dylib"
const libbtf = "@rpath/libbtf.dylib"
const libcamd = "@rpath/libcamd.dylib"
const libccolamd = "@rpath/libccolamd.dylib"
const libcholmod = "@rpath/libcholmod.dylib"
const libcolamd = "@rpath/libcolamd.dylib"
const libklu = "@rpath/libklu.dylib"
const libldl = "@rpath/libldl.dylib"
const librbio = "@rpath/librbio.dylib"
const libspqr = "@rpath/libspqr.dylib"
const libsuitesparseconfig = "@rpath/libsuitesparseconfig.dylib"
const libumfpack = "@rpath/libumfpack.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__()
Expand Down
4 changes: 2 additions & 2 deletions stdlib/Zlib_jll/src/Zlib_jll.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ libz_path = ""
if Sys.iswindows()
const libz = "libz.dll"
elseif Sys.isapple()
const libz = "@rpath/libz.1.dylib"
const libz = "@rpath/libz.dylib"
else
const libz = "libz.so.1"
const libz = "libz.so"
end

function __init__()
Expand Down
2 changes: 1 addition & 1 deletion stdlib/nghttp2_jll/src/nghttp2_jll.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__()
Expand Down