From 7b2f1c4d98b16c9c4d20ad992e0fa84d3085df77 Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Tue, 17 Mar 2015 19:46:23 -0400 Subject: [PATCH 1/2] Fix for JuliaLang/julia#10328 --- src/pyinit.jl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pyinit.jl b/src/pyinit.jl index 448974e6..e4dba3bb 100644 --- a/src/pyinit.jl +++ b/src/pyinit.jl @@ -10,7 +10,11 @@ end ######################################################################### -const dlext = isdefined(Sys, :dlext) ? Sys.dlext : Sys.shlib_ext +if VERSION >= v"0.4.0-dev+3844" + using Base.Libdl +else + const dlext = isdefined(Sys, :dlext) ? Sys.dlext : Sys.shlib_ext +end const dlprefix = @windows? "" : "lib" function dlopen_libpython(python::AbstractString) From be4b108a3578ca7f966666b3d05646fb0caf1334 Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Tue, 17 Mar 2015 19:48:58 -0400 Subject: [PATCH 2/2] Don't check for shlib_ext NEWS.md suggests it was removed before Julia 0.3 --- src/pyinit.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pyinit.jl b/src/pyinit.jl index e4dba3bb..2dbea553 100644 --- a/src/pyinit.jl +++ b/src/pyinit.jl @@ -13,7 +13,7 @@ end if VERSION >= v"0.4.0-dev+3844" using Base.Libdl else - const dlext = isdefined(Sys, :dlext) ? Sys.dlext : Sys.shlib_ext + const dlext = Sys.dlext end const dlprefix = @windows? "" : "lib"