Skip to content

Commit 7374127

Browse files
committed
Use JLL package to provide GSL binary library
1 parent b98c48d commit 7374127

File tree

6 files changed

+38
-77
lines changed

6 files changed

+38
-77
lines changed

.cirrus.yml

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

.travis.yml

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,30 @@
11
language: julia
22
os:
3-
- linux
4-
- osx
3+
- linux
4+
- osx
5+
- windows
6+
arch:
7+
- x64
8+
- x86
9+
- arm64
510
julia:
6-
- 1.0
7-
- 1.1
8-
- nightly
11+
- 1.3
12+
- 1.4
13+
- nightly
14+
jobs:
15+
allow_failures:
16+
- julia: nightly
17+
exclude:
18+
- os: osx
19+
arch: x86
20+
- os: osx
21+
arch: arm64
22+
- os: windows
23+
arch: arm64
24+
- julia: nightly
25+
arch: arm64
926
notifications:
10-
email: false
27+
email: false
1128

1229
after_success:
13-
- julia -e 'using Pkg; Pkg.add("Coverage"); cd(Pkg.dir("GSL")); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(process_folder())'
30+
- julia -e 'using Pkg; Pkg.add("Coverage"); cd(Pkg.dir("GSL")); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(process_folder())'

Project.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ uuid = "92c85e6c-cbff-5e0c-80f7-495c94daaecd"
33
version = "0.6.0"
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"
12-
SpecialFunctions = "^0.8.0"
13-
julia = "^1.0.0"
11+
SpecialFunctions = "0.8.0"
12+
GSL_jll = "2.6"
13+
julia = "1.3.0"
1414

1515
[extras]
1616
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

appveyor.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
environment:
22
matrix:
3-
- julia_version: 1
3+
- julia_version: 1.3
4+
- julia_version: 1.4
45
- julia_version: nightly
56

67
platform:

deps/build.jl

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

src/GSL.jl

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,17 @@ 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),
14+
"libgslcblas" * (Sys.iswindows() ? "-0." : "." ) * dlext)
15+
1816
# Generated code
1917
include("gen/gsl_export.jl")
2018
include("gen/gsl_types.jl")
@@ -24,8 +22,6 @@ include("gen/gsl_global_vars.jl")
2422
include("error_handling.jl")
2523

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

0 commit comments

Comments
 (0)