diff options
author | Narrat | 2015-11-07 15:11:54 +0100 |
---|---|---|
committer | Narrat | 2015-11-07 15:16:31 +0100 |
commit | f6b99a4e80f203061a11265116b08b4cb95726d3 (patch) | |
tree | 6ea9daec4af87566d3456544ee1c48f6decddbbb | |
parent | 94dcf2791d39953e8da1f0c3381f78ef56f67f1e (diff) | |
download | aur-f6b99a4e80f203061a11265116b08b4cb95726d3.tar.gz |
Julia: Put USE_SYSTEM into Make.user
Various reasons.
* It's the prefered version to customize the build process.
* It removes duplicate lines.
* And it will work again. Could just be a case of the newly added :, but before that all were set to USE_SYSTEM = 0
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | Make.user | 22 | ||||
-rw-r--r-- | PKGBUILD | 60 |
3 files changed, 36 insertions, 52 deletions
@@ -1,7 +1,7 @@ pkgbase = julia-git pkgdesc = High-level, high-performance, dynamic programming language - pkgver = 0.5.0.dev.r27289.g8681313 - pkgrel = 2 + pkgver = 0.5.0.dev.r28167.ga664281 + pkgrel = 1 url = http://julialang.org arch = i686 arch = x86_64 @@ -22,7 +22,9 @@ pkgbase = julia-git makedepends = patchelf options = !emptydirs source = git://github.com/JuliaLang/julia.git#branch=master + source = Make.user md5sums = SKIP + md5sums = e6ed32e3fa745f640489e6f19ab5c7e8 pkgname = julia-git install = julia.install diff --git a/Make.user b/Make.user new file mode 100644 index 000000000000..6c42a3f7e413 --- /dev/null +++ b/Make.user @@ -0,0 +1,22 @@ +#MARCH=${CARCH/_/-} +USE_SYSTEM_LLVM:=1 +USE_SYSTEM_LIBUNWIND:=1 +USE_SYSTEM_PCRE:=1 +USE_SYSTEM_LIBM:=1 +USE_SYSTEM_OPENLIBM:=1 +USE_SYSTEM_OPENSPECFUN:=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 +USE_SYSTEM_SUITESPARSE:=1 +USE_SYSTEM_LIBUV:=0 +USE_SYSTEM_UTF8PROC:=0 +USE_SYSTEM_LIBGIT2:=1 +USE_SYSTEM_PATCHELF:=1 +USE_INTEL_MKL:=0 +USE_BLAS64:=0 +USE_LLVM_SHLIB:=0 @@ -5,8 +5,8 @@ _pkgbase=julia pkgbase=${_pkgbase}-git pkgname=('julia-git' 'julia-git-docs') -pkgver=0.5.0.dev.r27289.g8681313 -pkgrel=2 +pkgver=0.5.0.dev.r28167.ga664281 +pkgrel=1 pkgdesc='High-level, high-performance, dynamic programming language' arch=('i686' 'x86_64') url="http://julialang.org" @@ -15,8 +15,10 @@ makedepends=('gcc-fortran' 'arpack' 'fftw' 'git' 'gmp' 'libgit2' 'libunwind' 'll # Needed if building the documentation #makedepends+=('juliadoc-git' 'texlive-langcjk' 'texlive-latexextra') options=('!emptydirs') -source=(git://github.com/JuliaLang/julia.git#branch=master) -md5sums=('SKIP') +source=(git://github.com/JuliaLang/julia.git#branch=master + Make.user) +md5sums=('SKIP' + 'e6ed32e3fa745f640489e6f19ab5c7e8') pkgver() { @@ -35,6 +37,9 @@ prepare() { # For /etc/ld.so.conf.d/ echo '/usr/lib/julia' > julia.conf + + # Move the Make.user in place + cp -v $srcdir/Make.user . } build() { @@ -44,28 +49,6 @@ build() { fi make -C $_pkgbase prefix=/usr sysconfdir=/etc \ - #MARCH=${CARCH/_/-} \ - USE_SYSTEM_LLVM=1 \ - USE_SYSTEM_LIBUNWIND=1 \ - USE_SYSTEM_PCRE=1 \ - USE_SYSTEM_LIBM=1 \ - USE_SYSTEM_OPENLIBM=1 \ - USE_SYSTEM_OPENSPECFUN=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 \ - USE_SYSTEM_SUITESPARSE=1 \ - USE_SYSTEM_LIBUV=0 \ - USE_SYSTEM_UTF8PROC=0 \ - USE_SYSTEM_LIBGIT2=1 \ - USE_SYSTEM_PATCHELF=1 \ - USE_INTEL_MKL=0 \ - USE_BLAS64=0 \ - USE_LLVM_SHLIB=0 # Building doc cd $_pkgbase/doc @@ -83,30 +66,7 @@ package_julia-git() { conflicts=('julia') backup=('etc/julia/juliarc.jl') - make -C $_pkgbase DESTDIR=$pkgdir prefix=/usr sysconfdir=/etc \ - #MARCH=${CARCH/_/-} \ - USE_SYSTEM_LLVM=1 \ - USE_SYSTEM_LIBUNWIND=1 \ - USE_SYSTEM_PCRE=1 \ - USE_SYSTEM_LIBM=1 \ - USE_SYSTEM_OPENLIBM=1 \ - USE_SYSTEM_OPENSPECFUN=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 \ - USE_SYSTEM_SUITESPARSE=1 \ - USE_SYSTEM_LIBUV=0 \ - USE_SYSTEM_UTF8PROC=0 \ - USE_SYSTEM_LIBGIT2=1 \ - USE_SYSTEM_PATCHELF=1 \ - USE_INTEL_MKL=0 \ - USE_BLAS64=0 \ - USE_LLVM_SHLIB=0 \ - install + make -C $_pkgbase DESTDIR=$pkgdir prefix=/usr sysconfdir=/etc install # For /etc/ld.so.conf.d, FS#41731 install -Dm644 julia.conf "$pkgdir/etc/ld.so.conf.d/julia.conf" |