Date: Tuesday, January 24, 2023 @ 20:56:34
Author: arojas
Revision: 1388128
upgpkg: julia 2:1.8.5-2: Fix warnings with suitesparse 7
Added:
julia/trunk/julia-suitesparse-7.patch
(from rev 1388127, julia/trunk/julia-suitesparse-version-mismatch.patch)
Modified:
julia/trunk/PKGBUILD
Deleted:
julia/trunk/julia-suitesparse-version-mismatch.patch
------------------------------------------+
PKGBUILD | 21 +++++++--------
julia-suitesparse-7.patch | 40 +++++++++++++++++++++++++++++
julia-suitesparse-version-mismatch.patch | 24 -----------------
3 files changed, 51 insertions(+), 34 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-01-24 20:55:38 UTC (rev 1388127)
+++ PKGBUILD 2023-01-24 20:56:34 UTC (rev 1388128)
@@ -9,7 +9,7 @@
pkgname=julia
epoch=2
pkgver=1.8.5
-pkgrel=1
+pkgrel=2
arch=(x86_64)
pkgdesc='High-level, high-performance, dynamic programming language'
url='https://julialang.org/'
@@ -35,9 +35,10 @@
julia-libunwind-1.6.patch
julia-system-cblas.patch
julia-hardcoded-libs.patch
- julia-suitesparse-version-mismatch.patch
+ julia-suitesparse-7.patch
julia-mpfr-4.2.patch
- https://github.com/JuliaLang/julia/commit/a48ad530.patch)
+ https://github.com/JuliaLang/julia/commit/a48ad530.patch
+ https://github.com/JuliaLang/julia/commit/0b211609.patch)
backup=(etc/julia/startup.jl)
sha256sums=('35554080a4b4d3ce52ef220254306bd42ac0d88eff9eb85592a57d0663db5df2'
'SKIP'
@@ -56,9 +57,10 @@
'cea321f7e16381dd795ee20d7bd5eda64f9b453c01d13e960962eb2723907e24'
'65f24275edb8357ded3c53fd8a10c3d1ed13fa3d34a3869df0c04da10dba6c9d'
'dd8896da27f691005c3294539fa229823a0ce33802b34287beae8709bbbe535d'
- '52c481d691940bbc4714d54cfde20fb1973350ba4a4c2386941a32fc007fdd85'
+ '8d01fc8f86e15e2ca2e743d559d99cad86f2d301c1b9de0ad01d89aa84684b8e'
'a47b2e110438082c101392b36d944ee8c40e6113231b88d1ba63b1c1b61b5eaa'
- '6539680cc18af72d6d92be7ce5b5480dd25462888131ad215effed4b6db77d40')
+ '6539680cc18af72d6d92be7ce5b5480dd25462888131ad215effed4b6db77d40'
+ 'dda2e9c99f074f57edbece7b24e8da2600c39b645578ef12d3603bdf528064ab')
validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495') # Julia (Binary
signing key) <[email protected]>
options=(!lto)
@@ -90,15 +92,14 @@
# Fix test failures due to using system blas
sed -e 's|0.22314355f0 + 3.1415927f0im|0.22314355f0 - 3.1415927f0im|' -i
stdlib/LinearAlgebra/test/lu.jl
sed -e 's|\$Int|Int32|' -i stdlib/LinearAlgebra/test/lu.jl
-# https://github.com/JuliaLang/julia/issues/47987
- mkdir -p usr/lib
- ln -s /usr/lib/libstdc++.so.6 usr/lib
+# Find system libstdc++
+ patch -p1 -i ../0b211609.patch
# Don't expect libssp.so
patch -p1 -i ../a48ad530.patch
-# Fix warnings with suitesparse 6
+# Fix warnings with suitesparse 7
cd stdlib/srccache
tar -xzf SuiteSparse-f63732c1c6adecb277d8f2981cc8c1883c321bcc.tar.gz
- patch -d JuliaSparse-SuiteSparse.jl-f63732c -p1 <
"$srcdir"/julia-suitesparse-version-mismatch.patch
+ patch -d JuliaSparse-SuiteSparse.jl-f63732c -p1 <
"$srcdir"/julia-suitesparse-7.patch
rm SuiteSparse-f63732c1c6adecb277d8f2981cc8c1883c321bcc.tar.gz
tar -czf SuiteSparse-f63732c1c6adecb277d8f2981cc8c1883c321bcc.tar.gz
JuliaSparse-SuiteSparse.jl-f63732c
_suitesparse_md5=$(md5sum
SuiteSparse-f63732c1c6adecb277d8f2981cc8c1883c321bcc.tar.gz | cut -d ' ' -f 1)
Copied: julia/trunk/julia-suitesparse-7.patch (from rev 1388127,
julia/trunk/julia-suitesparse-version-mismatch.patch)
===================================================================
--- julia-suitesparse-7.patch (rev 0)
+++ julia-suitesparse-7.patch 2023-01-24 20:56:34 UTC (rev 1388128)
@@ -0,0 +1,40 @@
+--- SuiteSparse-f63732c1c6adecb277d8f2981cc8c1883c321bcc/src/cholmod.jl.orig
2022-11-11 07:24:15.860939080 +0000
++++ SuiteSparse-f63732c1c6adecb277d8f2981cc8c1883c321bcc/src/cholmod.jl
2022-11-11 07:24:39.462357069 +0000
+@@ -182,21 +182,6 @@
+ from www.julialang.org, which ship with the correct
+ versions of all dependencies.
+ """
+- elseif BUILD_VERSION.major != current_version.major
+- @warn """
+- CHOLMOD version incompatibility
+-
+- Julia was compiled with CHOLMOD version $BUILD_VERSION. It is
+- currently linked with version $current_version.
+- This might cause Julia to terminate when working with
+- sparse matrix factorizations, e.g. solving systems of
+- equations with \\.
+-
+- It is recommended that you use Julia with the same major
+- version of CHOLMOD as the one used during the build, or
+- download the generic binaries from www.julialang.org,
+- which ship with the correct versions of all dependencies.
+- """
+ end
+
+ intsize = sizeof(SuiteSparse_long)
+@@ -232,15 +232,6 @@ function __init__()
+ COMMONS[i][].error_handler = errorhandler
+ end
+
+- # Register gc tracked allocator if CHOLMOD is new enough
+- if current_version >= v"3.0.0"
+- cnfg = cglobal((:SuiteSparse_config, :libsuitesparseconfig),
Ptr{Cvoid})
+- unsafe_store!(cnfg, cglobal(:jl_malloc, Ptr{Cvoid}), 1)
+- unsafe_store!(cnfg, cglobal(:jl_calloc, Ptr{Cvoid}), 2)
+- unsafe_store!(cnfg, cglobal(:jl_realloc, Ptr{Cvoid}), 3)
+- unsafe_store!(cnfg, cglobal(:jl_free, Ptr{Cvoid}), 4)
+- end
+-
+ catch ex
+ @error "Error during initialization of module CHOLMOD"
exception=ex,catch_backtrace()
+ end
Deleted: julia-suitesparse-version-mismatch.patch
===================================================================
--- julia-suitesparse-version-mismatch.patch 2023-01-24 20:55:38 UTC (rev
1388127)
+++ julia-suitesparse-version-mismatch.patch 2023-01-24 20:56:34 UTC (rev
1388128)
@@ -1,24 +0,0 @@
---- SuiteSparse-f63732c1c6adecb277d8f2981cc8c1883c321bcc/src/cholmod.jl.orig
2022-11-11 07:24:15.860939080 +0000
-+++ SuiteSparse-f63732c1c6adecb277d8f2981cc8c1883c321bcc/src/cholmod.jl
2022-11-11 07:24:39.462357069 +0000
-@@ -182,21 +182,6 @@
- from www.julialang.org, which ship with the correct
- versions of all dependencies.
- """
-- elseif BUILD_VERSION.major != current_version.major
-- @warn """
-- CHOLMOD version incompatibility
--
-- Julia was compiled with CHOLMOD version $BUILD_VERSION. It is
-- currently linked with version $current_version.
-- This might cause Julia to terminate when working with
-- sparse matrix factorizations, e.g. solving systems of
-- equations with \\.
--
-- It is recommended that you use Julia with the same major
-- version of CHOLMOD as the one used during the build, or
-- download the generic binaries from www.julialang.org,
-- which ship with the correct versions of all dependencies.
-- """
- end
-
- intsize = sizeof(SuiteSparse_long)
