Skip to content

Commit d93a15c

Browse files
Add build deps into build.jl (#80)
* try removing travis addons in favour of expanding build.jl * sudo for linux? * apt-get install * sudo * add-apt-repository * update readme * brew upgrade => brew update
1 parent e9fa4e5 commit d93a15c

File tree

3 files changed

+7
-17
lines changed

3 files changed

+7
-17
lines changed

.travis.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@ language: julia
33
os:
44
- linux
55
- osx
6-
addons:
7-
apt:
8-
sources: ubuntu-toolchain-r-test
9-
packages: ['gcc-8', 'libblas-dev', 'libopenblas-base', 'libfftw3-dev', 'libmpfr-dev']
10-
homebrew:
11-
packages: ['gcc@8', 'fftw', 'mpfr']
12-
update: true
136
julia:
147
- 1.0
158
- 1.1

README.md

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,12 @@ This package provides a Julia wrapper for the [C library](https://github.com/Mik
88

99
## Installation
1010

11-
The build script, which works on macOS and Linux systems with x86_64 processors, downloads precompiled binaries of the latest version of [FastTransforms](https://github.com/MikaelSlevinsky/FastTransforms). This library depends on `FFTW`, `MPFR`, and `OpenBLAS` (on Linux). Therefore, installation may be as straightforward as:
11+
The build script, which works on macOS and Linux systems with x86_64 processors, downloads precompiled binaries of the latest version of [FastTransforms](https://github.com/MikaelSlevinsky/FastTransforms). This library depends on `FFTW`, `MPFR`, and `OpenBLAS` (on Linux). Installation may be as straightforward as:
1212

1313
```julia
14-
julia> if Sys.isapple()
15-
run(`brew install gcc@8 fftw mpfr`)
16-
elseif Sys.islinux()
17-
run(`apt-get gcc-8 libblas-dev libopenblas-base libfftw3-dev libmpfr-dev`)
18-
end
19-
2014
pkg> add FastTransforms
2115

22-
pkg> build FastTransforms
23-
24-
julia> using FastTransforms
16+
julia> using FastTransforms, LinearAlgebra
2517

2618
```
2719

deps/build.jl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using BinaryProvider
22

33
if Sys.isapple()
4+
run(`brew update`)
5+
run(`brew install gcc@8 fftw mpfr`)
46
const libfasttransforms = joinpath(dirname(@__DIR__), "deps", "libfasttransforms.dylib")
57
GCC = BinaryProvider.detect_compiler_abi().gcc_version
68
println("Building with ", GCC, ".")
@@ -21,6 +23,9 @@ if Sys.isapple()
2123
@warn "Please ensure you have a version of gcc from gcc-4.9 to gcc-9."
2224
end
2325
elseif Sys.islinux()
26+
run(`sudo add-apt-repository ppa:ubuntu-toolchain-r/test`)
27+
run(`sudo apt-get update`)
28+
run(`sudo apt-get install gcc-8 libblas-dev libopenblas-base libfftw3-dev libmpfr-dev`)
2429
const libfasttransforms = joinpath(dirname(@__DIR__), "deps", "libfasttransforms.so")
2530
if arch(platform_key_abi()) != :x86_64
2631
@warn "FastTransforms only has compiled binaries for x86_64 architectures."

0 commit comments

Comments
 (0)