[arch-commits] Commit in julia/repos/community-x86_64 (8 files)
Antonio Rojas
arojas at archlinux.org
Sun Mar 22 08:43:54 UTC 2020
Date: Sunday, March 22, 2020 @ 08:43:54
Author: arojas
Revision: 603359
archrelease: copy trunk to community-x86_64
Added:
julia/repos/community-x86_64/PKGBUILD
(from rev 603358, julia/trunk/PKGBUILD)
julia/repos/community-x86_64/julia-system-cblas.patch
(from rev 603358, julia/trunk/julia-system-cblas.patch)
julia/repos/community-x86_64/libunwind-version.patch
(from rev 603358, julia/trunk/libunwind-version.patch)
julia/repos/community-x86_64/make-install-no-build.patch
(from rev 603358, julia/trunk/make-install-no-build.patch)
Deleted:
julia/repos/community-x86_64/PKGBUILD
julia/repos/community-x86_64/julia-system-cblas.patch
julia/repos/community-x86_64/libunwind-version.patch
julia/repos/community-x86_64/make-install-no-build.patch
-----------------------------+
PKGBUILD | 217 +++++++++++++++++-----------------
julia-system-cblas.patch | 266 +++++++++++++++++++++---------------------
libunwind-version.patch | 34 ++---
make-install-no-build.patch | 32 ++---
4 files changed, 276 insertions(+), 273 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-03-22 08:43:31 UTC (rev 603358)
+++ PKGBUILD 2020-03-22 08:43:54 UTC (rev 603359)
@@ -1,107 +0,0 @@
-# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
-# Contributor: Eli Schwartz <eschwartz at archlinux.org>
-# Contributor: Lex Black <autumn-wind at web.de>
-# Contributor: Michael Jakl <jakl.michael at gmail.com>
-# Contributor: devmotion <nospam-archlinux.org at devmotion.de>
-# Contributor: Valentin Churavy <v.churavy at gmail.com>
-
-pkgbase=julia
-pkgname=(julia julia-docs)
-epoch=2
-pkgver=1.3.1
-pkgrel=1
-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)
-makedepends=(cmake gcc-fortran gmp python)
-source=("https://github.com/JuliaLang/julia/releases/download/v$pkgver/$pkgbase-$pkgver-full.tar.gz"{,.asc}
- julia-system-cblas.patch
- libunwind-version.patch
- make-install-no-build.patch)
-sha256sums=('053908ec2706eb76cfdc998c077de123ecb1c60c945b4b5057aa3be19147b723'
- 'SKIP'
- 'd4c8fe9eec1bc416549924ae328ceb3f63cc736ecd5e67886faa924e7c14bc5d'
- '856dab2da8124df95e4fbd17f1164bebe1b10e99852fedf38f9dfe31f8ae295c'
- '0b57e0bc6e25c92fde8a6474394f7a99bfb57f9b5d0f7b53f988622ae67de8b7')
-# Julia (Binary signing key) <buildbot at julialang.org>
-validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495')
-
-prepare() {
- cd $pkgbase-$pkgver
-
- # Add and use option to build with system cblas
- patch -p1 -i ../julia-system-cblas.patch
-
- # Fixing libunwind version check
- # https://github.com/JuliaLang/julia/pull/29082
- patch -p1 -i ../libunwind-version.patch
-
- # Don't build again in install
- patch -p1 -i ../make-install-no-build.patch
-}
-
-build() {
- export PATH="$srcdir/bin:$PATH"
- env CFLAGS="$CFLAGS -w" CXXFLAGS="$CXXFLAGS -w" make VERBOSE=1 -C $pkgbase-$pkgver \
- USE_SYSTEM_LLVM=0 \
- 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-x86_64/PKGBUILD (from rev 603358, julia/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-03-22 08:43:54 UTC (rev 603359)
@@ -0,0 +1,110 @@
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: Lex Black <autumn-wind at web.de>
+# Contributor: Michael Jakl <jakl.michael at gmail.com>
+# Contributor: devmotion <nospam-archlinux.org at devmotion.de>
+# Contributor: Valentin Churavy <v.churavy at gmail.com>
+
+pkgbase=julia
+pkgname=(julia julia-docs)
+epoch=2
+pkgver=1.4.0
+pkgrel=1
+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)
+makedepends=(cmake gcc-fortran gmp python)
+source=("https://github.com/JuliaLang/julia/releases/download/v$pkgver/$pkgbase-$pkgver-full.tar.gz"{,.asc}
+ julia-system-cblas.patch
+ libunwind-version.patch
+ make-install-no-build.patch)
+sha256sums=('880c73a08296ce8d94ad9605149f2a2b2b028e7202a700ef725da899300b8be9'
+ 'SKIP'
+ 'd4c8fe9eec1bc416549924ae328ceb3f63cc736ecd5e67886faa924e7c14bc5d'
+ '856dab2da8124df95e4fbd17f1164bebe1b10e99852fedf38f9dfe31f8ae295c'
+ '0b57e0bc6e25c92fde8a6474394f7a99bfb57f9b5d0f7b53f988622ae67de8b7')
+# Julia (Binary signing key) <buildbot at julialang.org>
+validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495')
+
+prepare() {
+ cd $pkgbase-$pkgver
+
+ # Add and use option to build with system cblas
+ patch -p1 -i ../julia-system-cblas.patch
+
+ # Fixing libunwind version check
+ # https://github.com/JuliaLang/julia/pull/29082
+ patch -p1 -i ../libunwind-version.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=0 \
+ 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"
+}
Deleted: julia-system-cblas.patch
===================================================================
--- julia-system-cblas.patch 2020-03-22 08:43:31 UTC (rev 603358)
+++ julia-system-cblas.patch 2020-03-22 08:43:54 UTC (rev 603359)
@@ -1,133 +0,0 @@
-From 0c442318196389d653ee21eba65d8c4f7beb72a0 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz at 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-x86_64/julia-system-cblas.patch (from rev 603358, julia/trunk/julia-system-cblas.patch)
===================================================================
--- julia-system-cblas.patch (rev 0)
+++ julia-system-cblas.patch 2020-03-22 08:43:54 UTC (rev 603359)
@@ -0,0 +1,133 @@
+From 0c442318196389d653ee21eba65d8c4f7beb72a0 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz at 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[]
Deleted: libunwind-version.patch
===================================================================
--- libunwind-version.patch 2020-03-22 08:43:31 UTC (rev 603358)
+++ libunwind-version.patch 2020-03-22 08:43:54 UTC (rev 603359)
@@ -1,17 +0,0 @@
-diff --git a/src/julia_internal.h b/src/julia_internal.h
-index 186b5d7b2b..33143f2062 100644
---- a/src/julia_internal.h
-+++ b/src/julia_internal.h
-@@ -612,12 +612,9 @@ extern volatile int jl_in_stackwalk;
- # include <libunwind.h>
- typedef unw_context_t bt_context_t;
- typedef unw_cursor_t bt_cursor_t;
--# if (!defined(SYSTEM_LIBUNWIND) || UNW_VERSION_MAJOR > 1 || \
-- (UNW_VERSION_MAJOR == 1 && UNW_VERSION_MINOR != 0 && UNW_VERSION_MINOR != 1))
- // Enable our memory manager only for libunwind with our patch or
- // on a newer release
- # define JL_UNW_HAS_FORMAT_IP 1
--# endif
- #else
- // Unwinding is disabled
- typedef int bt_context_t;
Copied: julia/repos/community-x86_64/libunwind-version.patch (from rev 603358, julia/trunk/libunwind-version.patch)
===================================================================
--- libunwind-version.patch (rev 0)
+++ libunwind-version.patch 2020-03-22 08:43:54 UTC (rev 603359)
@@ -0,0 +1,17 @@
+diff --git a/src/julia_internal.h b/src/julia_internal.h
+index 186b5d7b2b..33143f2062 100644
+--- a/src/julia_internal.h
++++ b/src/julia_internal.h
+@@ -612,12 +612,9 @@ extern volatile int jl_in_stackwalk;
+ # include <libunwind.h>
+ typedef unw_context_t bt_context_t;
+ typedef unw_cursor_t bt_cursor_t;
+-# if (!defined(SYSTEM_LIBUNWIND) || UNW_VERSION_MAJOR > 1 || \
+- (UNW_VERSION_MAJOR == 1 && UNW_VERSION_MINOR != 0 && UNW_VERSION_MINOR != 1))
+ // Enable our memory manager only for libunwind with our patch or
+ // on a newer release
+ # define JL_UNW_HAS_FORMAT_IP 1
+-# endif
+ #else
+ // Unwinding is disabled
+ typedef int bt_context_t;
Deleted: make-install-no-build.patch
===================================================================
--- make-install-no-build.patch 2020-03-22 08:43:31 UTC (rev 603358)
+++ make-install-no-build.patch 2020-03-22 08:43:54 UTC (rev 603359)
@@ -1,16 +0,0 @@
---- 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
Copied: julia/repos/community-x86_64/make-install-no-build.patch (from rev 603358, julia/trunk/make-install-no-build.patch)
===================================================================
--- make-install-no-build.patch (rev 0)
+++ make-install-no-build.patch 2020-03-22 08:43:54 UTC (rev 603359)
@@ -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
More information about the arch-commits
mailing list