Date: Wednesday, November 15, 2017 @ 11:24:40 Author: arodseth Revision: 266866
upgpkg: julia 2:0.6.1-2 Modified: julia/trunk/PKGBUILD julia/trunk/sysfix.install ----------------+ PKGBUILD | 51 +++++++++++++++++++++++++-------------------------- sysfix.install | 2 +- 2 files changed, 26 insertions(+), 27 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-11-15 11:14:49 UTC (rev 266865) +++ PKGBUILD 2017-11-15 11:24:40 UTC (rev 266866) @@ -7,19 +7,19 @@ pkgbase=julia pkgname=('julia' 'julia-docs') +epoch=2 pkgver=0.6.1 -pkgrel=1 -epoch=2 -arch=('x86_64' 'i686') +pkgrel=2 +arch=('x86_64') pkgdesc='High-level, high-performance, dynamic programming language' -url='http://julialang.org/' +url='https://julialang.org/' license=('MIT') -makedepends=('gcc-fortran' 'python2' 'blas' 'lapack' 'arpack' 'libunwind' 'fftw' - 'gmp' 'mpfr' 'zlib' 'suitesparse' 'patchelf' 'cmake' 'pcre2' 'libgit2' 'llvm39') +makedepends=('arpack' 'cmake' 'fftw' 'gcc-fortran' 'gmp' 'libgit2' 'libunwind' 'llvm39' 'mpfr' 'patchelf' 'pcre2' 'python2' 'suitesparse') options=('!emptydirs' 'staticlibs') -source=("https://github.com/JuliaLang/julia/releases/download/v$pkgver/julia-$pkgver.tar.gz"{,.asc} - julia-libunwind-version.patch julia-makefile.patch) -sha256sums=('e68adfa85df529f8ad092a9bf85d2350101c658fe455c5ebf2b6d119359e10d9' +source=("https://github.com/JuliaLang/$pkgbase/releases/download/v$pkgver/$pkgbase-$pkgver-full.tar.gz"{,.asc} + julia-libunwind-version.patch + julia-makefile.patch) +sha256sums=('75289fd8f5fb04bd10c9ca16853d9f0e72bb683639ff448dbb8f67a81dc4fc0e' 'SKIP' '16009ce454f58463464027cbaf6186ccfab84c37660a52fb1ec3a0f514df64f9' '342b43532fbace3508688eee879113160e01cbbda29610b53f2f34796bc0312a') @@ -29,7 +29,7 @@ # For /etc/ld.so.conf.d/ echo '/usr/lib/julia' > julia.conf - cd $pkgname + cd julia patch -p1 -i ../julia-libunwind-version.patch sed -e 's|-lLLVM|-lLLVM-3.9|' -i src/Makefile # link against llvm39 patch -p0 -i ../julia-makefile.patch # make 'make install' really just install @@ -40,19 +40,12 @@ export CFLAGS="-mtune=generic -O3 -pipe -fstack-protector-strong" export CXXFLAGS="-mtune=generic -O3 -pipe -fstack-protector-strong" - # SSE2 is a requirement for Julia on 32-bit x86 unset ARCH - if [[ $CARCH == i686 ]]; then - export M="pentium4" - export CFLAGS+=" -march=pentium4" - export CXXFLAGS+=" -march=pentium4" - else - export M="x86-64" - fi - cd julia - make prefix=/usr sysconfdir=/etc \ - MARCH=$M \ + make -C julia \ + MARCH="x86-64" \ + prefix=/usr \ + sysconfdir=/etc \ JULIA_BUILD_MODE=release \ USE_SYSTEM_LLVM=1 \ USE_SYSTEM_LIBUNWIND=1 \ @@ -60,8 +53,8 @@ USE_SYSTEM_LIBM=1 \ USE_SYSTEM_OPENLIBM=0 \ USE_SYSTEM_OPENSPECFUN=0 \ - USE_SYSTEM_BLAS=1 \ - USE_SYSTEM_LAPACK=1 \ + USE_SYSTEM_BLAS=0 \ + USE_SYSTEM_LAPACK=0 \ USE_SYSTEM_FFTW=1 \ USE_SYSTEM_GMP=1 \ USE_SYSTEM_MPFR=1 \ @@ -79,7 +72,7 @@ package_julia() { backup=('etc/ld.so.conf.d/julia.conf' 'etc/julia/juliarc.jl') - depends=('arpack' 'fftw' 'libunwind' 'mpfr' 'suitesparse' 'pcre2' 'libgit2' 'patchelf' 'hicolor-icon-theme' 'llvm39-libs') + depends=('arpack' 'fftw' 'hicolor-icon-theme' 'libgit2' 'libunwind' 'llvm39-libs' 'mpfr' 'patchelf' 'pcre2' 'suitesparse') optdepends=('gnuplot: If using the Gaston Package from julia') install='sysfix.install' @@ -106,8 +99,8 @@ USE_SYSTEM_LIBM=1 \ USE_SYSTEM_OPENLIBM=0 \ USE_SYSTEM_OPENSPECFUN=0 \ - USE_SYSTEM_BLAS=1 \ - USE_SYSTEM_LAPACK=1 \ + USE_SYSTEM_BLAS=0 \ + USE_SYSTEM_LAPACK=0 \ USE_SYSTEM_FFTW=1 \ USE_SYSTEM_GMP=1 \ USE_SYSTEM_MPFR=1 \ @@ -135,6 +128,9 @@ rm -rvf "$pkgdir/usr/share/julia/examples/" install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md" + + # Minor improvement + patchelf --set-rpath /usr/lib "$pkgdir/usr/bin/julia" } package_julia-docs() { @@ -146,3 +142,6 @@ cp -rv examples "$pkgdir/usr/share/doc/$pkgbase/examples" install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md" } + +# getver: julialang.org/downloads +# vim: ts=2 sw=2 et: Modified: sysfix.install =================================================================== --- sysfix.install 2017-11-15 11:14:49 UTC (rev 266865) +++ sysfix.install 2017-11-15 11:24:40 UTC (rev 266866) @@ -1,6 +1,6 @@ post_install() { # Removing sys.so if needed, in order for Julia to start, see FS#39721 - julia --version 2>/dev/null || rm /usr/lib/julia/sys.so + julia --version &>/dev/null || rm /usr/lib/julia/sys.so } post_upgrade() {