Skip to content

Commit 4f85978

Browse files
committed
Use JLL package to provide GSL binary library
1 parent 436eecc commit 4f85978

File tree

6 files changed

+10
-71
lines changed

6 files changed

+10
-71
lines changed

.cirrus.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ task:
44
name: FreeBSD
55
env:
66
matrix:
7-
- JULIA_VERSION: 1.0
8-
- JULIA_VERSION: 1.1
7+
- JULIA_VERSION: 1.3
98
- JULIA_VERSION: nightly
109
install_script:
1110
- sh -c "$(fetch https://raw.githubusercontent.com/ararslan/CirrusCI.jl/master/bin/install.sh -o -)"

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ os:
33
- linux
44
- osx
55
julia:
6-
- 1.0
7-
- 1.1
6+
- 1.3
87
- nightly
98
notifications:
109
email: false

Project.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ uuid = "92c85e6c-cbff-5e0c-80f7-495c94daaecd"
33
version = "0.5.1"
44

55
[deps]
6-
BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
76
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
7+
GSL_jll = "1b77fbbe-d8ee-58f0-85f9-836ddc23a7a4"
88
Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
99

1010
[compat]
11-
BinaryProvider = "≥ 0.5.2"
1211
SpecialFunctions = "≥ 0.6.0"
13-
julia = "^1.0.0"
12+
julia = "^1.3.0"
1413

1514
[extras]
1615
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
environment:
22
matrix:
3-
- julia_version: 1
3+
- julia_version: 1.3
44
- julia_version: nightly
55

66
platform:

deps/build.jl

Lines changed: 0 additions & 53 deletions
This file was deleted.

src/GSL.jl

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,16 @@ module GSL
22

33
using Markdown
44

5-
65
# BEGIN MODULE C
76
# low-level interface
87
module C
9-
# Deps
10-
const depsfile = joinpath(dirname(@__DIR__), "deps", "deps.jl")
11-
if isfile(depsfile)
12-
include(depsfile)
13-
else
14-
error("GSL is not properly installed. Please build it first.")
15-
end
168

179
using Markdown
10+
using Libdl
11+
using GSL_jll
12+
13+
const libgslcblas = joinpath(dirname(GSL_jll.libgsl_path), "libgslcblas.$(dlext)")
14+
1815
# Generated code
1916
include("gen/gsl_export.jl")
2017
include("gen/gsl_types.jl")
@@ -24,8 +21,6 @@ include("gen/gsl_global_vars.jl")
2421
include("error_handling.jl")
2522

2623
function __init__()
27-
# Load library
28-
check_deps()
2924
# Seems we need to load BLAS with this RTLD_GLOBAL
3025
flags = Libdl.RTLD_LAZY | Libdl.RTLD_DEEPBIND | Libdl.RTLD_GLOBAL
3126
if Libdl.dlopen_e(libgslcblas, flags) in (C_NULL, nothing)

0 commit comments

Comments
 (0)