Date: Tuesday, January 5, 2021 @ 07:11:08 Author: kkeen Revision: 808395
archrelease: copy trunk to community-staging-x86_64 Added: julia/repos/community-staging-x86_64/ julia/repos/community-staging-x86_64/PKGBUILD (from rev 808394, julia/trunk/PKGBUILD) julia/repos/community-staging-x86_64/julia-system-cblas.patch (from rev 808394, julia/trunk/julia-system-cblas.patch) julia/repos/community-staging-x86_64/make-install-no-build.patch (from rev 808394, julia/trunk/make-install-no-build.patch) -----------------------------+ PKGBUILD | 104 ++++++++++++++++++++++++++++++++ julia-system-cblas.patch | 133 ++++++++++++++++++++++++++++++++++++++++++ make-install-no-build.patch | 16 +++++ 3 files changed, 253 insertions(+) Copied: julia/repos/community-staging-x86_64/PKGBUILD (from rev 808394, julia/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2021-01-05 07:11:08 UTC (rev 808395) @@ -0,0 +1,104 @@ +# Maintainer: Alexander F. Rødseth <xypr...@archlinux.org> +# Contributor: Eli Schwartz <eschwa...@archlinux.org> +# Contributor: Lex Black <autumn-w...@web.de> +# Contributor: Michael Jakl <jakl.mich...@gmail.com> +# Contributor: devmotion <nospam-archlinux....@devmotion.de> +# Contributor: Valentin Churavy <v.chur...@gmail.com> + +pkgbase=julia +pkgname=(julia julia-docs) +epoch=2 +pkgver=1.5.3 +pkgrel=2 +arch=(x86_64) +pkgdesc='High-level, high-performance, dynamic programming language' +url='https://julialang.org/' +license=(MIT) +depends=(cblas fftw hicolor-icon-theme libgit2 libunwind libutf8proc openblas + suitesparse mbedtls openlibm pcre2 llvm10-libs) +makedepends=(cmake gcc-fortran gmp python llvm10) +source=("https://github.com/JuliaLang/julia/releases/download/v$pkgver/$pkgbase-$pkgver-full.tar.gz"{,.asc} + julia-system-cblas.patch + make-install-no-build.patch) +sha256sums=('fb69337ca037576758547c7eed9ae8f153a9c052318327b6b7f1917408c14d91' + 'SKIP' + 'd4c8fe9eec1bc416549924ae328ceb3f63cc736ecd5e67886faa924e7c14bc5d' + '0b57e0bc6e25c92fde8a6474394f7a99bfb57f9b5d0f7b53f988622ae67de8b7') +# Julia (Binary signing key) <build...@julialang.org> +validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495') + +prepare() { + cd $pkgbase-$pkgver + + # Add and use option to build with system cblas + patch -p1 -i ../julia-system-cblas.patch + + # Don't build again in install + patch -p1 -i ../make-install-no-build.patch + + # Fix test failure + sed -e 's|0.22314355f0 + 3.1415927f0im|0.22314355f0 - 3.1415927f0im|' -i stdlib/LinearAlgebra/test/lu.jl +} + +build() { + export PATH="$srcdir/bin:$PATH" + env CFLAGS="$CFLAGS -w" CXXFLAGS="$CXXFLAGS -w" make VERBOSE=1 -C $pkgbase-$pkgver \ + USE_SYSTEM_LLVM=1 \ + USE_SYSTEM_LIBUNWIND=1 \ + USE_SYSTEM_PCRE=1 \ + USE_SYSTEM_BLAS=1 \ + USE_SYSTEM_LAPACK=1 \ + USE_SYSTEM_GMP=1 \ + USE_SYSTEM_MPFR=1 \ + USE_SYSTEM_SUITESPARSE=1 \ + USE_SYSTEM_DSFMT=0 \ + USE_SYSTEM_LIBUV=0 \ + USE_SYSTEM_UTF8PROC=1 \ + USE_SYSTEM_LIBGIT2=1 \ + USE_SYSTEM_LIBSSH2=1 \ + USE_SYSTEM_MBEDTLS=1 \ + USE_SYSTEM_CURL=1 \ + USE_SYSTEM_PATCHELF=1 \ + USE_SYSTEM_ZLIB=1 \ + USE_SYSTEM_P7ZIP=1 \ + USE_SYSTEM_OPENLIBM=1 \ + MARCH=x86-64 +} + +check() { + cd $pkgbase-$pkgver/test + + # this is the make testall target, plus the --skip option from + # travis/appveyor/circleci (one test fails with DNS resolution errors) + ../julia --check-bounds=yes --startup-file=no ./runtests.jl all --skip Sockets --skip Distributed --skip LibGit2/libgit2 + find ../stdlib \( -name \*.cov -o -name \*.mem \) -delete + rm -r depot/compiled +} + +package_julia() { + backup=(etc/julia/startup.jl) + optdepends=('gnuplot: If using the Gaston Package from julia') + + make -C $pkgbase-$pkgver DESTDIR="$pkgdir" install \ + prefix=/usr \ + libexecdir=/usr/lib \ + sysconfdir=/etc + + # Documentation is in the julia-docs package. + # Man pages in /usr/share/julia/doc/man are duplicate. + rm -rf "$pkgdir/usr/share/"{doc,julia/doc} + + install -Dm644 $pkgbase-$pkgver/LICENSE.md \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md" +} + +package_julia-docs() { + pkgdesc='Documentation and examples for Julia' + depends=(julia) + + install -d "$pkgdir/usr/share/doc" + cp -r $pkgbase-$pkgver/doc "$pkgdir/usr/share/doc/$pkgbase" + rm -rf "$pkgdir/usr/share/doc/julia/man" + install -Dm644 $pkgbase-$pkgver/LICENSE.md \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md" +} Copied: julia/repos/community-staging-x86_64/julia-system-cblas.patch (from rev 808394, julia/trunk/julia-system-cblas.patch) =================================================================== --- community-staging-x86_64/julia-system-cblas.patch (rev 0) +++ community-staging-x86_64/julia-system-cblas.patch 2021-01-05 07:11:08 UTC (rev 808395) @@ -0,0 +1,133 @@ +From 0c442318196389d653ee21eba65d8c4f7beb72a0 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwa...@archlinux.org> +Date: Fri, 5 Oct 2018 15:52:17 +0000 +Subject: [PATCH] Use a dedicated cblas library, that may or may not be in fact + the blas one. + +Openblas can be built with statically compiled convenience copies of +cblas, but if not, then the system libcblas.so should be used. +--- + Make.inc | 12 +++++++++++- + Makefile | 3 +++ + base/Makefile | 4 ++++ + stdlib/LinearAlgebra/src/blas.jl | 15 +++++++++++++-- + 4 files changed, 31 insertions(+), 3 deletions(-) + +diff --git a/Make.inc b/Make.inc +index b00a41b356d8..7bc6cd69e863 100644 +--- a/Make.inc ++++ b/Make.inc +@@ -945,6 +945,7 @@ endif + ifeq ($(USE_SYSTEM_BLAS), 1) + ifeq ($(OS), Darwin) + USE_BLAS64 := 0 ++USE_SYSTEM_CBLAS := 0 + USE_SYSTEM_LAPACK := 0 + LIBBLAS := -L$(build_libdir) -lgfortblas + LIBBLASNAME := libgfortblas +@@ -957,12 +958,21 @@ LIBBLAS := -L$(build_shlibdir) -lopenblas + LIBBLASNAME := libopenblas + endif + +-# OpenBLAS builds LAPACK as part of its build. ++# OpenBLAS builds cblas/LAPACK as part of its build. + # We only need to build LAPACK if we are not using OpenBLAS. + ifeq ($(USE_SYSTEM_BLAS), 0) ++LIBCBLAS := $(LIBBLAS) ++LIBCBLASNAME := $(LIBBLASNAME) + LIBLAPACK := $(LIBBLAS) + LIBLAPACKNAME := $(LIBBLASNAME) + else ++ifeq ($(USE_SYSTEM_CBLAS), 1) ++LIBCBLAS ?= -lcblas ++LIBCBLASNAME ?= libcblas ++else ++LIBCBLAS := -L$(build_shlibdir) -lcblas $(LIBBLAS) ++LIBCBLASNAME := libcblas ++endif + ifeq ($(USE_SYSTEM_LAPACK), 1) + LIBLAPACK ?= -llapack + LIBLAPACKNAME ?= liblapack +diff --git a/Makefile b/Makefile +index 6063e79ae956..7df60b8170d6 100644 +--- a/Makefile ++++ b/Makefile +@@ -184,6 +184,9 @@ endif + endif + + JL_PRIVATE_LIBS-$(USE_SYSTEM_BLAS) += $(LIBBLASNAME) ++ifneq ($(LIBCBLASNAME),$(LIBBLASNAME)) ++JL_PRIVATE_LIBS-$(USE_SYSTEM_CBLAS) += $(LIBCBLASNAME) ++endif + ifneq ($(LIBLAPACKNAME),$(LIBBLASNAME)) + JL_PRIVATE_LIBS-$(USE_SYSTEM_LAPACK) += $(LIBLAPACKNAME) + endif +diff --git a/base/Makefile b/base/Makefile +index 70e6da933d70..8ecfa6902b59 100644 +--- a/base/Makefile ++++ b/base/Makefile +@@ -42,6 +42,7 @@ else + endif + @echo "const libm_name = \"$(LIBMNAME)\"" >> $@ + @echo "const libblas_name = \"$(LIBBLASNAME)\"" >> $@ ++ @echo "const libcblas_name = \"$(LIBCBLASNAME)\"" >> $@ + @echo "const liblapack_name = \"$(LIBLAPACKNAME)\"" >> $@ + ifeq ($(USE_BLAS64), 1) + @echo "const USE_BLAS64 = true" >> $@ +@@ -183,6 +184,9 @@ endif + $(eval $(call symlink_system_library,libpcre2-8,PCRE)) + $(eval $(call symlink_system_library,libdSFMT,DSFMT)) + $(eval $(call symlink_system_library,$(LIBBLASNAME),BLAS)) ++ifneq ($(LIBCBLASNAME),$(LIBBLASNAME)) ++$(eval $(call symlink_system_library,$(LIBCBLASNAME),CBLAS)) ++endif + ifneq ($(LIBLAPACKNAME),$(LIBBLASNAME)) + $(eval $(call symlink_system_library,$(LIBLAPACKNAME),LAPACK)) + endif +diff --git a/stdlib/LinearAlgebra/src/blas.jl b/stdlib/LinearAlgebra/src/blas.jl +index fee8c9e74d7e..8c76d1acbf29 100644 +--- a/stdlib/LinearAlgebra/src/blas.jl ++++ b/stdlib/LinearAlgebra/src/blas.jl +@@ -61,6 +61,7 @@ export + + + const libblas = Base.libblas_name ++const libcblas = Base.libcblas_name + const liblapack = Base.liblapack_name + + import LinearAlgebra +@@ -101,6 +102,16 @@ else + end + end + ++if libcblas == libblas ++ macro cblasfunc(x) ++ return @blasfunc(x) ++ end ++else ++ macro cblasfunc(x) ++ return Expr(:quote, x) ++ end ++end ++ + openblas_get_config() = strip(unsafe_string(ccall((@blasfunc(openblas_get_config), libblas), Ptr{UInt8}, () ))) + + """ +@@ -300,7 +311,7 @@ for (fname, elty) in ((:cblas_zdotc_sub,:ComplexF64), + # DOUBLE PRECISION DX(*),DY(*) + function dotc(n::Integer, DX::Union{Ptr{$elty},AbstractArray{$elty}}, incx::Integer, DY::Union{Ptr{$elty},AbstractArray{$elty}}, incy::Integer) + result = Ref{$elty}() +- ccall((@blasfunc($fname), libblas), Cvoid, ++ ccall((@cblasfunc($fname), libcblas), Cvoid, + (BlasInt, Ptr{$elty}, BlasInt, Ptr{$elty}, BlasInt, Ptr{$elty}), + n, DX, incx, DY, incy, result) + result[] +@@ -318,7 +329,7 @@ for (fname, elty) in ((:cblas_zdotu_sub,:ComplexF64), + # DOUBLE PRECISION DX(*),DY(*) + function dotu(n::Integer, DX::Union{Ptr{$elty},AbstractArray{$elty}}, incx::Integer, DY::Union{Ptr{$elty},AbstractArray{$elty}}, incy::Integer) + result = Ref{$elty}() +- ccall((@blasfunc($fname), libblas), Cvoid, ++ ccall((@cblasfunc($fname), libcblas), Cvoid, + (BlasInt, Ptr{$elty}, BlasInt, Ptr{$elty}, BlasInt, Ptr{$elty}), + n, DX, incx, DY, incy, result) + result[] Copied: julia/repos/community-staging-x86_64/make-install-no-build.patch (from rev 808394, julia/trunk/make-install-no-build.patch) =================================================================== --- community-staging-x86_64/make-install-no-build.patch (rev 0) +++ community-staging-x86_64/make-install-no-build.patch 2021-01-05 07:11:08 UTC (rev 808395) @@ -0,0 +1,16 @@ +--- julia-1.3.0/Makefile.orig 2019-12-06 12:54:23.879790955 +0000 ++++ julia-1.3.0/Makefile 2019-12-06 12:54:36.329952953 +0000 +@@ -277,12 +277,7 @@ + endif + + +-install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html +-ifeq ($(BUNDLE_DEBUG_LIBS),1) +- @$(MAKE) $(QUIET_MAKE) all +-else +- @$(MAKE) $(QUIET_MAKE) release +-endif ++install: + @for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir) $(libexecdir); do \ + mkdir -p $(DESTDIR)$$subdir; \ + done