julia: update to 1.1.0

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12036 ec354946-7b23-47d6-9f5a-488ba84defc7

j/julia/julia-vl.spec

@@ -1,6 +1,6 @@
 %define pkg_name    julia
-%define pkg_version 1.0.3
-%define pkg_release 2%{?_dist_release}
+%define pkg_version 1.1.0
+%define pkg_release 1%{?_dist_release}
 
 Summary: High-level, high-performance dynamic programming language for numerical computing
 Name:    %{pkg_name}
@@ -17,11 +17,11 @@ URL:     https://julialang.org/
 Source0: https://github.com/JuliaLang/julia/releases/download/v%{version}/%{name}-%{version}.tar.gz
 
 Source11: libunwind-1.1-julia2.tar.gz
-Source12: libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz
+Source12: libuv-2348256acf5759a544e5ca7935f638d2bc091d60.tar.gz
 Source13: patchelf-0.9.tar.gz
 Source14: utf8proc-97ef668b312b96382714dbb8eaac4affce0816e6.tar.gz
-Source15: llvm-6.0.0.src.tar.xz
-Source16: openblas-e8a68ef261a33568b0f0cf53e0e2287e9f12e69e.tar.gz
+Source15: llvm-6.0.1.src.tar.xz
+# Source16: openblas-fd8d1868a126bb9f12bbc43b36ee30d1ba943fbb.tar.gz
 Source17: libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz
 Source18: mpfr-4.0.1.tar.bz2
 
@@ -51,9 +51,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: cmake
 BuildRequires: gcc-gfortran
 BuildRequires: gmp-devel
+BuildRequires: openblas-devel
+%ifarch x86_64
+BuildRequires: openblas64-devel
+%endif
 BuildRequires: openspecfun-devel
 BuildRequires: openlibm-devel
-BuildRequires: blas lapack suitesparse-devel
+BuildRequires: suitesparse-devel
 BuildRequires: dSFMT-devel
 BuildRequires: pcre2-devel
 BuildRequires: curl-devel
@@ -63,8 +67,12 @@ BuildRequires: mbedtls-devel
 BuildRequires: libatomic
 BuildRequires: desktop-file-utils
 
+Requires: openblas-threads
+%ifarch x86_64
+Requires: openblas-threads64_
+%endif
 Requires: openlibm
-Requires: blas lapack suitesparse
+Requires: suitesparse
 Requires: dSFMT
 Requires: pcre2
 Requires: libssh2 mbedtls
@@ -126,11 +134,10 @@ USE_SYSTEM_PCRE=1
 USE_SYSTEM_DSFMT=1
 USE_SYSTEM_GMP=1
 USE_SYSTEM_MPFR=0
+USE_SYSTEM_BLAS=1
+USE_SYSTEM_LAPACK=1
 USE_SYSTEM_SUITESPARSE=1
 
-USE_SYSTEM_BLAS=0
-USE_SYSTEM_LAPACK=0
-
 USE_SYSTEM_LIBSSH2=1
 USE_SYSTEM_CURL=1
 USE_SYSTEM_LIBGIT2=1
@@ -140,18 +147,12 @@ EOF
 %{__mkdir_p} deps/srccache
 %{__cp} \
  %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} %{SOURCE15} \
- %{SOURCE16} %{SOURCE17} %{SOURCE18} \
+ %{SOURCE17} %{SOURCE18} \
  deps/srccache
 
-# About build, build_libdir and build_bindir
-# see https://github.com/JuliaLang/julia/issues/5063#issuecomment-32628111
-%global julia_builddir %{_builddir}/%{name}-%{version}/build
-%global installopts prefix=%{_prefix} bindir=%{_bindir} libdir=%{_libdir} libexecdir=%{_libexecdir} datarootdir=%{_datarootdir} includedir=%{_includedir} sysconfdir=%{_sysconfdir} build_prefix=%{julia_builddir} build_bindir=%{julia_builddir}%{_bindir} build_libdir=%{julia_builddir}%{_libdir} build_private_libdir=%{julia_builddir}%{_libdir}/julia build_libexecdir=%{julia_builddir}%{_libexecdir} build_datarootdir=%{julia_builddir}%{_datarootdir} build_includedir=%{julia_builddir}%{_includedir} build_sysconfdir=%{julia_builddir}%{_sysconfdir}
-
 # Required so that the image is not optimized for the build CPU
-# # (i386 does not work yet: https://github.com/JuliaLang/julia/issues/7185)
-# # Without specifying MARCH, the Julia system image would only work on native CPU
-# using openblas
+# (i386 does not work yet: https://github.com/JuliaLang/julia/issues/7185)
+# Without specifying MARCH, the Julia system image would only work on native CPU
 %ifarch %{ix86}
 %global march pentium4
 %endif
@@ -159,7 +160,20 @@ EOF
 %global march x86-64
 %endif
 
-%global commonopts MARCH=%{march} %{installopts}
+# setting for using system openblas
+%ifarch %{ix86}
+%global blas USE_BLAS64=0 LIBBLAS=-lopenblasp LIBBLASNAME=libopenblasp LIBLAPACK=-lopenblasp LIBLAPACKNAME=libopenblasp
+%endif
+%ifarch x86_64
+%global blas USE_BLAS64=1 LIBBLAS=-lopenblasp64_ LIBBLASNAME=libopenblasp64_ LIBLAPACK=-lopenblasp64_ LIBLAPACKNAME=libopenblasp64_
+%endif
+
+# About build, build_libdir and build_bindir
+# see https://github.com/JuliaLang/julia/issues/5063#issuecomment-32628111
+%global julia_builddir %{_builddir}/%{name}-%{version}/build
+%global installopts prefix=%{_prefix} bindir=%{_bindir} libdir=%{_libdir} libexecdir=%{_libexecdir} datarootdir=%{_datarootdir} includedir=%{_includedir} sysconfdir=%{_sysconfdir} build_prefix=%{julia_builddir} build_bindir=%{julia_builddir}%{_bindir} build_libdir=%{julia_builddir}%{_libdir} build_private_libdir=%{julia_builddir}%{_libdir}/julia build_libexecdir=%{julia_builddir}%{_libexecdir} build_datarootdir=%{julia_builddir}%{_datarootdir} build_includedir=%{julia_builddir}%{_includedir} build_sysconfdir=%{julia_builddir}%{_sysconfdir}
+
+%global commonopts MARCH=%{march} %{blas} %{installopts}
 
 %build
 %{__make} %{?_smp_mflags} %{commonopts}
@@ -171,12 +185,7 @@ touch doc/_build/html/en/index.html
 %install
 %{__make} %{commonopts} install DESTDIR=${RPM_BUILD_ROOT}
 
-# remove unnecessary sofiles
-pushd ${RPM_BUILD_ROOT}%{_libdir}/julia
-%{__rm} libgcc_s.so.* libgfortran.so.* libquadmath.so.*
-popd
-
-# move html files
+# remove html files
 pushd ${RPM_BUILD_ROOT}%{_docdir}
 %{__mv} julia %{name}-%{version}
 %{__rm} -rf %{name}-%{version}/html
@@ -211,11 +220,11 @@ fi
 
 %files
 %defattr(-, root, root)
-%{_bindir}/julia*
+%{_bindir}/julia
 %{_sysconfdir}/%{name}
 %{_includedir}/%{name}
 %{_libdir}/%{name}/
-%{_libdir}/libjulia*
+%{_libdir}/libjulia.so*
 %{_datadir}/appdata/
 %{_datadir}/applications/
 %{_datadir}/icons/
@@ -225,6 +234,10 @@ fi
 
 
 %changelog
+* Mon Jan 28 2019 Toshiaki Ara <ara_t@384.jp> 1.1.0-1
+- update to 1.1.0
+- change using system openblas
+
 * Sat Jan 26 2019 Toshiaki Ara <ara_t@384.jp> 1.0.3-2
 - remove unnecessary sofiles
 - rebuild with gfortran-8.2.0