summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarrat2017-12-17 00:40:18 +0100
committerNarrat2017-12-17 00:43:05 +0100
commit8911c3bb17cf3c81e9438bab8ef8068a51abd0b2 (patch)
tree16e1feba1ba168f166d624f7314bb4eabfa01da2
parent4d15dcfb72d0f3eab7e32cb437caba3acd8bf763 (diff)
downloadaur-8911c3bb17cf3c81e9438bab8ef8068a51abd0b2.tar.gz
Julia: move fftw from deps to opt
Isn't included in the base package anymore. If someone wants to use it, they need the fftw.jl package
-rw-r--r--.SRCINFO7
-rw-r--r--Make.user1
-rw-r--r--PKGBUILD9
3 files changed, 8 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 70551684f680..1f8e8e709668 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = julia-git
pkgdesc = High-level, high-performance, dynamic programming language
pkgver = 0.7.0.DEV.r39764.ge89a2b8123
- pkgrel = 1
+ pkgrel = 2
url = http://julialang.org
arch = i686
arch = x86_64
@@ -10,7 +10,6 @@ pkgbase = julia-git
makedepends = git
makedepends = arpack
makedepends = blas>=3.5.0
- makedepends = fftw
makedepends = gmp
makedepends = lapack>=3.5.0
makedepends = libgit2
@@ -30,12 +29,11 @@ pkgbase = julia-git
source = git://github.com/JuliaLang/julia.git#branch=master
source = Make.user
md5sums = SKIP
- md5sums = 44824845d81f144da7ad898fd1e973c6
+ md5sums = 88c5523c984fe3dcd03a746c882a691c
pkgname = julia-git
depends = arpack
depends = blas>=3.5.0
- depends = fftw
depends = gmp
depends = lapack>=3.5.0
depends = libgit2
@@ -52,6 +50,7 @@ pkgname = julia-git
depends = desktop-file-utils
depends = gtk-update-icon-cache
optdepends = openblas-lapack: multithreaded replacement for lapack
+ optdepends = fftw: If using the FFTW package from julia
optdepends = gnuplot: If using the Gaston Package from julia
provides = julia
conflicts = julia
diff --git a/Make.user b/Make.user
index f42be7a61564..49dc8e04bc3e 100644
--- a/Make.user
+++ b/Make.user
@@ -7,7 +7,6 @@ USE_SYSTEM_OPENLIBM:=1
USE_SYSTEM_DSFMT:=0
USE_SYSTEM_BLAS:=1
USE_SYSTEM_LAPACK:=1
-USE_SYSTEM_FFTW:=1
USE_SYSTEM_GMP:=1
USE_SYSTEM_MPFR:=1
USE_SYSTEM_ARPACK:=1
diff --git a/PKGBUILD b/PKGBUILD
index 6bd6d3322341..0c5eea8389b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,13 +6,13 @@ _pkgbase=julia
pkgbase=${_pkgbase}-git
pkgname=('julia-git' 'julia-git-docs')
pkgver=0.7.0.DEV.r39764.ge89a2b8123
-pkgrel=1
+pkgrel=2
pkgdesc='High-level, high-performance, dynamic programming language'
arch=('i686' 'x86_64')
url="http://julialang.org"
license=('MIT')
makedepends=('gcc-fortran' 'git')
-makedepends+=('arpack' 'blas>=3.5.0' 'fftw' 'gmp' 'lapack>=3.5.0' 'libgit2'
+makedepends+=('arpack' 'blas>=3.5.0' 'gmp' 'lapack>=3.5.0' 'libgit2'
'libunwind' 'llvm39' 'mbedtls' 'mpfr' 'openlibm'
'pcre2' 'suitesparse' 'patchelf' 'hicolor-icon-theme'
'xdg-utils' 'desktop-file-utils' 'gtk-update-icon-cache') # 'utf8proc' (AUR) 'intel-mkl' (AUR)
@@ -22,7 +22,7 @@ options=('!emptydirs')
source=(git://github.com/JuliaLang/julia.git#branch=master
Make.user)
md5sums=('SKIP'
- '44824845d81f144da7ad898fd1e973c6')
+ '88c5523c984fe3dcd03a746c882a691c')
pkgver() {
@@ -62,11 +62,12 @@ build() {
package_julia-git() {
backup=('etc/ld.so.conf.d/julia.conf' 'etc/julia/juliarc.jl')
- depends=('arpack' 'blas>=3.5.0' 'fftw' 'gmp' 'lapack>=3.5.0' 'libgit2'
+ depends=('arpack' 'blas>=3.5.0' 'gmp' 'lapack>=3.5.0' 'libgit2'
'libunwind' 'llvm39' 'mbedtls' 'mpfr' 'openlibm'
'pcre2' 'suitesparse' 'patchelf' 'hicolor-icon-theme'
'xdg-utils' 'desktop-file-utils' 'gtk-update-icon-cache') # 'utf8proc' (AUR) 'intel-mkl' (AUR)
optdepends=('openblas-lapack: multithreaded replacement for lapack'
+ 'fftw: If using the FFTW package from julia'
'gnuplot: If using the Gaston Package from julia')
provides=('julia')
conflicts=('julia')