[arch-commits] Commit in julia/trunk (PKGBUILD julia-libblastrampoline-4.patch)

[Antonio Rojas]

    Date: Friday, January 21, 2022 @ 20:32:37
  Author: arojas
Revision: 1112621

Backport another LLVM13 fix (FS#73247), use upstream libblastrampoline patch

Modified:
  julia/trunk/PKGBUILD
  julia/trunk/julia-libblastrampoline-4.patch

---------------------------------+
 PKGBUILD                        |    9 ++++++---
 julia-libblastrampoline-4.patch |   10 ++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-21 20:31:50 UTC (rev 1112620)
+++ PKGBUILD	2022-01-21 20:32:37 UTC (rev 1112621)
@@ -9,7 +9,7 @@
 pkgname=julia
 epoch=2
 pkgver=1.7.1
-pkgrel=5
+pkgrel=6
 arch=(x86_64)
 pkgdesc='High-level, high-performance, dynamic programming language'
 url='https://julialang.org/'
@@ -23,6 +23,7 @@
         https://github.com/JuliaLang/julia/commit/677ce6d3.patch
         https://github.com/JuliaLang/julia/commit/47f9139e.patch
         https://github.com/JuliaLang/julia/commit/1eb063f1.patch
+        https://github.com/JuliaLang/julia/commit/99d4e655.patch
         f8c918b0.patch
         63303980.patch
         julia-libgit-1.2.patch
@@ -39,6 +40,7 @@
             'a798c58ab518def84e4112538de59a10802e7dc854c20b08990a1619ba2aa95b'
             'c76c6fbb4e04b185d11e3c3e0aec99a2088f3b06621ce61d29cd21227a044a7a'
             '37130eabce304a01c1de389b4596905a3f33881f46f3f04a87f0738668e13985'
+            'b6ea2d6b2cfa8cd9a8903fd25d609544710f25bb3074841c884459f62e8dc74a'
             'bc6c85cbbca489ef0b2876dbeb6ae493c11573e058507b8bcb9e01273bc3a38c'
             'ce9cd140c3bc39987d60340bf365d6238e79cf4d5385494272c49c64af22ef78'
             'c57ea92a11fa8dac72229e6a912d2372ec0d98d63486426fe3bdeeb795de48f7'
@@ -48,7 +50,7 @@
             '6048c69c987f33f2b17d78b63368b0762d1d6a1e531ef9932d0c23bda49d1384'
             '3afa172e8b54ce48e77542677b2b7143199d444bfeed39be1644ce88b513a3d0'
             '710587dd88c7698dc5cdf47a1a50f6f144b584b7d9ffb85fac3f5f79c65fce11'
-            '7077a4321eab9b4b67efdfc80dfa6acac1f88bd45f2f55c417a19e50019ee4f2')
+            '79cd957d0599a8ee1dbdf7f2ebd1a5bd85ab7e499584858e89a8d9609ba1ced4')
 validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495') # Julia (Binary signing key) <buildbot at julialang.org>
 options=(!lto)
 
@@ -55,12 +57,13 @@
 prepare() {
   cd $pkgname-$pkgver
 
-# fix build with LLVM 13
+# fixes for LLVM 13
   patch -p1 -i ../677ce6d3.patch
   patch -p1 -i ../47f9139e.patch
   patch -p1 -i ../1eb063f1.patch
   patch -p1 -i ../f8c918b0.patch
   patch -p1 -i ../63303980.patch
+  patch -p1 -i ../99d4e655.patch
 # libgit2 1.2 compatibility
   patch -p1 -i ../julia-libgit-1.2.patch
 # libunwind 1.6 compatibility

Modified: julia-libblastrampoline-4.patch
===================================================================
--- julia-libblastrampoline-4.patch	2022-01-21 20:31:50 UTC (rev 1112620)
+++ julia-libblastrampoline-4.patch	2022-01-21 20:32:37 UTC (rev 1112621)
@@ -1,13 +1,15 @@
 diff --git a/stdlib/LinearAlgebra/src/lbt.jl b/stdlib/LinearAlgebra/src/lbt.jl
-index b1a2dc24b3..b0d6242738 100644
+index 26b3a1210a3f..ea1ab25c9e1a 100644
 --- a/stdlib/LinearAlgebra/src/lbt.jl
 +++ b/stdlib/LinearAlgebra/src/lbt.jl
-@@ -155,7 +155,7 @@ function lbt_set_num_threads(nthreads)
+@@ -156,8 +156,8 @@ function lbt_set_num_threads(nthreads)
+     return ccall((:lbt_set_num_threads, libblastrampoline), Cvoid, (Int32,), nthreads)
  end
  
- function lbt_forward(path; clear::Bool = false, verbose::Bool = false)
+-function lbt_forward(path; clear::Bool = false, verbose::Bool = false)
 -    ccall((:lbt_forward, libblastrampoline), Int32, (Cstring, Int32, Int32), path, clear ? 1 : 0, verbose ? 1 : 0)
-+    ccall((:lbt_forward, libblastrampoline), Int32, (Cstring, Int32, Int32, Cstring), path, clear ? 1 : 0, verbose ? 1 : 0, C_NULL)
++function lbt_forward(path; clear::Bool = false, verbose::Bool = false, suffix_hint::Union{String,Nothing} = nothing)
++    ccall((:lbt_forward, libblastrampoline), Int32, (Cstring, Int32, Int32, Cstring), path, clear ? 1 : 0, verbose ? 1 : 0, something(suffix_hint, C_NULL))
  end
  
  function lbt_set_default_func(addr)