[arch-commits] Commit in julia/trunk (Make.user PKGBUILD)

[Eli Schwartz]

    Date: Friday, October 5, 2018 @ 18:14:58
  Author: eschwartz
Revision: 390239

upgpkg: julia 2:1.0.1-2

devendor (c)blas/lapack

Modified:
  julia/trunk/Make.user
  julia/trunk/PKGBUILD

-----------+
 Make.user |    9 +++++++--
 PKGBUILD  |   13 +++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

Modified: Make.user
===================================================================
--- Make.user	2018-10-05 18:10:20 UTC (rev 390238)
+++ Make.user	2018-10-05 18:14:58 UTC (rev 390239)
@@ -1,13 +1,13 @@
+# vim: set ft=make:
+
 override prefix = /usr
 override sysconfdir = /etc
 override MARCH = x86-64
 override JULIA_BUILD_MODE = release
 override USE_BLAS64 = 0
-override USE_SYSTEM_BLAS = 0
 override USE_SYSTEM_DSFMT = 0
 override USE_SYSTEM_FFTW = 1
 override USE_SYSTEM_GMP = 1
-override USE_SYSTEM_LAPACK = 0
 override USE_SYSTEM_LIBGIT2 = 1
 override USE_SYSTEM_LIBM = 0
 override USE_SYSTEM_LIBUNWIND = 1
@@ -18,6 +18,11 @@
 override USE_SYSTEM_SUITESPARSE = 1
 override USE_SYSTEM_UTF8PROC = 1
 
+# system blas with cblas symbols linked too
+override USE_SYSTEM_BLAS = 1
+override USE_SYSTEM_CBLAS = 1
+override USE_SYSTEM_LAPACK = 1
+
 # FS#57387
 override USE_SYSTEM_LLVM = 0
 override USE_LLVM_SHLIB = 0

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-05 18:10:20 UTC (rev 390238)
+++ PKGBUILD	2018-10-05 18:14:58 UTC (rev 390239)
@@ -9,23 +9,25 @@
 pkgname=(julia julia-docs)
 epoch=2
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 pkgdesc='High-level, high-performance, dynamic programming language'
 url='https://julialang.org/'
 license=('MIT')
-depends=('fftw' 'hicolor-icon-theme' 'libgit2' 'libunwind' 'libutf8proc'
-         'suitesparse')
+depends=('cblas' 'fftw' 'hicolor-icon-theme' 'libgit2' 'libunwind' 'libutf8proc'
+         'openblas' 'suitesparse')
 makedepends=('cmake' 'gcc-fortran' 'gmp' 'python2')
 source=("https://github.com/JuliaLang/$pkgbase/releases/download/v$pkgver/$pkgbase-$pkgver-full.tar.gz"{,.asc}
+        'https://github.com/JuliaLang/julia/pull/29540/commits/0c442318196389d653ee21eba65d8c4f7beb72a0.patch'
         'julia-libunwind-version.diff'
         'julia-makefile.diff'
         'Make.user')
 sha256sums=('874e6e67dedc6b0dfed7faba9963abf1fa8086bd13a4457c05203ab0b78ebd22'
             'SKIP'
+            '88fcbd8a2450027aada0892a60c49c891a8dae43ee6c19e64364b1a1373d50bc'
             '22974e1a6602c250cd993cc89cf38fd24668617484f44cadd60665e9af15207b'
             'b7374fcd5a579fc59d6988795fc0c3cf411a89205942c691a5b3003793ae6c52'
-            '67577a8ecf98e1593f5a649ff5bc36380878e6c16dfea46a3ffde8d3c87e672b')
+            '9381af45e329f874241eec5a5d85e70a7945433ab9ee82215e28a6085783df88')
 # Julia (Binary signing key) <buildbot at julialang.org>
 validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495')
 
@@ -32,6 +34,9 @@
 prepare() {
   cd $pkgbase
 
+  # add and use option to build with system cblas
+  patch -p1 --no-backup-if-mismatch -i ../0c442318196389d653ee21eba65d8c4f7beb72a0.patch
+
   # https://github.com/JuliaLang/julia/pull/29082
   msg2 'Fixing libunwind version check...'
   patch -p1 -i ../julia-libunwind-version.diff