[arch-commits] Commit in julia/trunk (4 files)
Antonio Rojas
arojas at gemini.archlinux.org
Thu Dec 2 22:11:47 UTC 2021
Date: Thursday, December 2, 2021 @ 22:11:47
Author: arojas
Revision: 1062775
Update to 1.7.0
Added:
julia/trunk/julia-llvm-patchelf.patch
Modified:
julia/trunk/PKGBUILD
julia/trunk/julia-hardcoded-libs.patch
julia/trunk/julia-system-cblas.patch
----------------------------+
PKGBUILD | 40 +++++++++++++++++-----------------------
julia-hardcoded-libs.patch | 2 +-
julia-llvm-patchelf.patch | 15 +++++++++++++++
julia-system-cblas.patch | 28 ++++++++++++++--------------
4 files changed, 47 insertions(+), 38 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-02 22:01:32 UTC (rev 1062774)
+++ PKGBUILD 2021-12-02 22:11:47 UTC (rev 1062775)
@@ -7,7 +7,7 @@
pkgname=julia
epoch=2
-pkgver=1.6.4
+pkgver=1.7.0
pkgrel=1
arch=(x86_64)
pkgdesc='High-level, high-performance, dynamic programming language'
@@ -14,51 +14,43 @@
url='https://julialang.org/'
license=(MIT)
depends=(cblas fftw hicolor-icon-theme libgit2 libunwind libutf8proc openblas
- suitesparse mbedtls openlibm pcre2 llvm-libs p7zip)
-makedepends=(cmake gcc-fortran python llvm patchelf)
+ suitesparse mbedtls openlibm pcre2 llvm-libs p7zip libblastrampoline)
+makedepends=(cmake gcc-fortran python llvm patchelf libwhich)
+checkdepends=(git)
optdepends=('gnuplot: If using the Gaston Package from julia')
replaces=(julia-docs)
source=(https://github.com/JuliaLang/julia/releases/download/v$pkgver/$pkgname-$pkgver-full.tar.gz{,.asc}
- https://github.com/JuliaLang/julia/commit/7df16be0.patch
https://github.com/JuliaLang/julia/commit/677ce6d3.patch
- https://github.com/JuliaLang/julia/commit/a2d85f6d.patch
https://github.com/JuliaLang/julia/commit/47f9139e.patch
https://github.com/JuliaLang/julia/commit/0f7d183c.patch
- https://github.com/JuliaLang/julia/commit/d6a655bc.patch
julia-llvm13.patch
julia-libgit-1.2.patch
julia-system-cblas.patch
julia-hardcoded-libs.patch
- make-install-no-build.patch)
+ make-install-no-build.patch
+ julia-llvm-patchelf.patch)
backup=(etc/julia/startup.jl)
-sha256sums=('954578b973fdb891c88fa1eedd931129e215ab928ecc416dd0bdf6c70549d2fc'
+sha256sums=('d40d83944f8e1709de1d6f7544e1a6721e091f70ba06b44c25b89bdba754dfa6'
'SKIP'
- '764582f5ac30e694ee99aba6b0ad6cbf45d1ad53e90005678eb3fe7b30781e64'
'a798c58ab518def84e4112538de59a10802e7dc854c20b08990a1619ba2aa95b'
- '8d0dd9693a2db66ac09b8f08e162bee74a8f4aebbdb3aa422a677d688671d00b'
'c76c6fbb4e04b185d11e3c3e0aec99a2088f3b06621ce61d29cd21227a044a7a'
'67053b0da6fe46f82dc676b78adbdf2e6939d851316fefe328c6de6baa58e338'
- '1d636ab9f93dd0a509d2a365fb6a975d87b5df7667f1d9f6844741818e37fbc9'
'ab8a8ec61963661dca5bb2fa965dccaa36c500d55ef7b6767b8faef5fff461b5'
'c57ea92a11fa8dac72229e6a912d2372ec0d98d63486426fe3bdeeb795de48f7'
- 'e44c260e4111908337caa82e1c3fef563b9d40e0a30da68d6e91405bf6db24dc'
- 'a8e664f39f3efaeea63e99c2f5727a28ab7eca01e9164b464c66e991426d7e90'
- '8be4605f92a009072ca7e843549c225fc4e959893498e7c4f8f79e861e63714d')
+ '8f8c12853ce847f5d1b5a4a461ddec701decdb81dae7bb31d66560c1deaed97a'
+ '03043f005c133ac9af1d4dc113ea8b525ad3b393690625be77975f0e29dd6457'
+ '8be4605f92a009072ca7e843549c225fc4e959893498e7c4f8f79e861e63714d'
+ '6048c69c987f33f2b17d78b63368b0762d1d6a1e531ef9932d0c23bda49d1384')
validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495') # Julia (Binary signing key) <buildbot at julialang.org>
prepare() {
cd $pkgname-$pkgver
-# fix bad performance with LLVM 12
- patch -p1 -i ../7df16be0.patch
# fix build with LLVM 13
patch -p1 -i ../677ce6d3.patch
- patch -p1 -i ../a2d85f6d.patch
patch -p1 -i ../47f9139e.patch
# Adapt to LLVM 13 type changes
patch -p1 -i ../julia-llvm13.patch
-# Fix LazyArtifacts tests
- patch -p1 -i ../d6a655bc.patch
# libgit2 1.2 compatibility
patch -p1 -i ../julia-libgit-1.2.patch
# Add and use option to build with system cblas
@@ -69,6 +61,8 @@
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
+# Don't try to run patchelf on system LLVM
+ patch -p1 -i ../julia-llvm-patchelf.patch
}
_buildopts="prefix=/usr \
@@ -84,7 +78,9 @@
USE_SYSTEM_LAPACK=1 \
USE_SYSTEM_GMP=1 \
USE_SYSTEM_MPFR=1 \
- USE_SYSTEM_SUITESPARSE=1 \
+ USE_SYSTEM_LIBSUITESPARSE=1 \
+ USE_SYSTEM_LIBBLASTRAMPOLINE=1 \
+ USE_SYSTEM_LIBWHICH=1 \
USE_SYSTEM_DSFMT=0 \
USE_SYSTEM_LIBUV=0 \
USE_SYSTEM_UTF8PROC=1 \
@@ -101,8 +97,6 @@
build() {
cd $pkgname-$pkgver
make release VERBOSE=1 JLDFLAGS=${LDFLAGS} $_buildopts
-
- ln -s /usr/lib/libopenblas.so usr/lib/julia/libopenblas64_.so # Needed for tests
}
check() {
@@ -111,7 +105,7 @@
# this is the make testall target, plus the --skip option from
# travis/appveyor/circleci (one test fails with DNS resolution errors)
# Also skip tests that check for a hardcoded version number
- ../julia --check-bounds=yes --startup-file=no ./runtests.jl all \
+ ../julia --check-bounds=yes --startup-file=no ./runtests.jl \
--skip Sockets \
--skip broadcast \
--skip Distributed \
Modified: julia-hardcoded-libs.patch
===================================================================
--- julia-hardcoded-libs.patch 2021-12-02 22:01:32 UTC (rev 1062774)
+++ julia-hardcoded-libs.patch 2021-12-02 22:11:47 UTC (rev 1062775)
@@ -23,7 +23,7 @@
elseif Sys.isapple()
const libLLVM = "@rpath/libLLVM.dylib"
else
-- const libLLVM = "libLLVM-11jl.so"
+- const libLLVM = "libLLVM-12jl.so"
+ const libLLVM = "libLLVM.so"
end
Added: julia-llvm-patchelf.patch
===================================================================
--- julia-llvm-patchelf.patch (rev 0)
+++ julia-llvm-patchelf.patch 2021-12-02 22:11:47 UTC (rev 1062775)
@@ -0,0 +1,15 @@
+diff --git a/Makefile b/Makefile
+index a013747a97..02e566de2e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -368,10 +368,6 @@ ifeq ($(BUNDLE_DEBUG_LIBS),1)
+ endif
+ endif
+
+- # Set rpath for LLVM.so which is `$ORIGIN/../lib` moving from `../lib` to `../lib/julia`. We only need to do this for Linux/FreeBSD
+-ifneq (,$(findstring $(OS),Linux FreeBSD))
+- $(PATCHELF) --set-rpath '$$ORIGIN:$$ORIGIN/$(reverse_private_libdir_rel)' $(DESTDIR)$(private_libdir)/libLLVM.$(SHLIB_EXT)
+-endif
+
+
+ ifneq ($(LOADER_BUILD_DEP_LIBS),$(LOADER_INSTALL_DEP_LIBS))
Modified: julia-system-cblas.patch
===================================================================
--- julia-system-cblas.patch 2021-12-02 22:01:32 UTC (rev 1062774)
+++ julia-system-cblas.patch 2021-12-02 22:11:47 UTC (rev 1062775)
@@ -85,22 +85,22 @@
$(eval $(call symlink_system_library,LAPACK,$(LIBLAPACKNAME)))
endif
diff --git a/stdlib/LinearAlgebra/src/blas.jl b/stdlib/LinearAlgebra/src/blas.jl
-index fee8c9e74d7e..8c76d1acbf29 100644
+index 661e9e2b15..9bc1034682 100644
--- a/stdlib/LinearAlgebra/src/blas.jl
+++ b/stdlib/LinearAlgebra/src/blas.jl
-@@ -61,6 +61,7 @@ export
-
-
- const libblas = Base.libblas_name
+@@ -71,6 +71,7 @@ libblastrampoline_handle = C_NULL
+ # should not look at these, instead preferring to parse the output
+ # of BLAS.get_config()
+ const libblas = libblastrampoline
+const libcblas = Base.libcblas_name
- const liblapack = Base.liblapack_name
+ const liblapack = libblastrampoline
import LinearAlgebra
-@@ -101,6 +102,16 @@ else
+@@ -109,6 +110,16 @@ else
end
end
-+if libcblas == libblas
++if libcblas == libblastrampoline
+ macro cblasfunc(x)
+ return @blasfunc(x)
+ end
@@ -110,23 +110,23 @@
+ end
+end
+
- openblas_get_config() = strip(unsafe_string(ccall((@blasfunc(openblas_get_config), libblas), Ptr{UInt8}, () )))
+ _tryparse_env_int(key) = tryparse(Int, get(ENV, key, ""))
- """
-@@ -300,7 +311,7 @@ for (fname, elty) in ((:cblas_zdotc_sub,:ComplexF64),
+
+@@ -327,7 +338,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((@blasfunc($fname), libblastrampoline), 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),
+@@ -345,7 +356,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((@blasfunc($fname), libblastrampoline), Cvoid,
+ ccall((@cblasfunc($fname), libcblas), Cvoid,
(BlasInt, Ptr{$elty}, BlasInt, Ptr{$elty}, BlasInt, Ptr{$elty}),
n, DX, incx, DY, incy, result)
More information about the arch-commits
mailing list