From 047515bf29935d95735c7f641a5536b6203128e6 Mon Sep 17 00:00:00 2001 From: Adam Beckmeyer Date: Wed, 5 May 2021 22:11:42 -0400 Subject: [PATCH] julia: update to 1.6.1. Also change to using vendored llvm to reduce maintenance burden from julia depending on versions of llvm which are quickly obsoleted (closes #30490); this should also fix julia's build being broken on i686. This doesn't address #29964, and a decision should still be made on whether to accept #30061. [ci skip] for building llvm --- srcpkgs/julia/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/julia/template b/srcpkgs/julia/template index 6ff8671036c7..600e8bddca0b 100644 --- a/srcpkgs/julia/template +++ b/srcpkgs/julia/template @@ -1,12 +1,12 @@ # Template file for 'julia' pkgname=julia -version=1.6.0 +version=1.6.1 revision=1 archs="i686* x86_64* armv7l* aarch64*" build_style=gnu-makefile make_build_args="prefix=/usr sysconfdir=/etc datarootdir=/usr/share USE_BINARYBUILDER=0 USE_SYSTEM_LIBM=0 USE_SYSTEM_DSFMT=0 USE_SYSTEM_LIBUV=0 - USE_SYSTEM_SUITESPARSE=0 USE_SYSTEM_BLAS=0 USE_SYSTEM_LAPACK=0 USE_SYSTEM_LLVM=1 + USE_SYSTEM_SUITESPARSE=0 USE_SYSTEM_BLAS=0 USE_SYSTEM_LAPACK=0 USE_SYSTEM_LLVM=0 USE_SYSTEM_LIBUNWIND=1 USE_SYSTEM_PCRE=1 USE_SYSTEM_GMP=1 USE_SYSTEM_PATCHELF=1 USE_SYSTEM_MPFR=1 USE_SYSTEM_MBEDTLS=1 USE_SYSTEM_LIBSSH2=1 USE_SYSTEM_NGHTTP2=1 USE_SYSTEM_CURL=1 USE_SYSTEM_ZLIB=1 USE_SYSTEM_P7ZIP=1 USE_SYSTEM_LIBGIT2=1 @@ -19,7 +19,7 @@ conf_files="/etc/julia/startup.jl" hostmakedepends="pkg-config perl cmake python gcc-fortran patchelf which tar xz" makedepends="p7zip pcre2-devel mpfr-devel libgit2-devel libcurl-devel nghttp2-devel libssh2-devel mbedtls-devel libatomic-devel zlib-devel libunwind-devel - libutf8proc-devel llvm11" + libutf8proc-devel" # Julia provides vendored symlinks in /usr/lib/julia pointing to these libraries, # but none of the julia executables link to them so these are not auto-detected depends="libgit2 libcurl mpfr mbedtls libatomic libpcre2 libssh2 nghttp2 libquadmath libssp p7zip" @@ -28,8 +28,10 @@ maintainer="Adam Beckmeyer " license="MIT" homepage="https://julialang.org" distfiles="https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz" -checksum=1b05f42c9368bc2349c47363b7ddc175a2da3cd162d52b6e24c4f5d4d6e1232c +checksum=71d8e40611361370654e8934c407b2dec04944cf3917c5ecb6482d6b85ed767f nocross="build system is a mess" +# Avoid pulling in llvm as a dependency for "libLLVM-11.so" +skiprdeps="/usr/lib/julia/libjulia-internal.so.1.6 /usr/lib/julia/libllvmcalltest.so" # Targets for the vendored symlinks mentioned above shlib_requires="libgit2.so.1.0 libcurl.so.4 libmpfr.so.6 libgmp.so.10 libmbedcrypto.so.3 libmbedtls.so.12 libmbedx509.so.0 libpcre2-8.so.0