[arch-commits] Commit in julia/trunk (PKGBUILD julia-libunwind-1.6.patch)

[Antonio Rojas]

    Date: Saturday, December 25, 2021 @ 22:19:33
  Author: arojas
Revision: 1083805

libunwind 1.6 rebuild (FS#73155)

Added:
  julia/trunk/julia-libunwind-1.6.patch
Modified:
  julia/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   10 +++++++---
 julia-libunwind-1.6.patch |   20 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-25 22:10:53 UTC (rev 1083804)
+++ PKGBUILD	2021-12-25 22:19:33 UTC (rev 1083805)
@@ -9,7 +9,7 @@
 pkgname=julia
 epoch=2
 pkgver=1.7.1
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 pkgdesc='High-level, high-performance, dynamic programming language'
 url='https://julialang.org/'
@@ -27,7 +27,8 @@
         julia-system-cblas.patch
         julia-hardcoded-libs.patch
         make-install-no-build.patch
-        julia-llvm-patchelf.patch)
+        julia-llvm-patchelf.patch
+        julia-libunwind-1.6.patch)
 backup=(etc/julia/startup.jl)
 sha256sums=('add869121b7e788ff487a234fd39484469dbb3ded29b17041c63c4757515dd58'
             'SKIP'
@@ -38,7 +39,8 @@
             '8f8c12853ce847f5d1b5a4a461ddec701decdb81dae7bb31d66560c1deaed97a'
             '03043f005c133ac9af1d4dc113ea8b525ad3b393690625be77975f0e29dd6457'
             '8be4605f92a009072ca7e843549c225fc4e959893498e7c4f8f79e861e63714d'
-            '6048c69c987f33f2b17d78b63368b0762d1d6a1e531ef9932d0c23bda49d1384')
+            '6048c69c987f33f2b17d78b63368b0762d1d6a1e531ef9932d0c23bda49d1384'
+            '3afa172e8b54ce48e77542677b2b7143199d444bfeed39be1644ce88b513a3d0')
 validpgpkeys=('3673DF529D9049477F76B37566E3C7DC03D6E495') # Julia (Binary signing key) <buildbot at julialang.org>
 
 prepare() {
@@ -51,6 +53,8 @@
   patch -p1 -i ../julia-llvm13.patch
 # libgit2 1.2 compatibility
   patch -p1 -i ../julia-libgit-1.2.patch
+# libunwind 1.6 compatibility
+  patch -p1 -i ../julia-libunwind-1.6.patch
 # Add and use option to build with system cblas
   patch -p1 -i ../julia-system-cblas.patch # Add and use option to build with system cblas
 # Don't hardcode library names

Added: julia-libunwind-1.6.patch
===================================================================
--- julia-libunwind-1.6.patch	                        (rev 0)
+++ julia-libunwind-1.6.patch	2021-12-25 22:19:33 UTC (rev 1083805)
@@ -0,0 +1,20 @@
+diff --git a/src/debuginfo.cpp b/src/debuginfo.cpp
+index 95b562311b..69fceb0cfe 100644
+--- a/src/debuginfo.cpp
++++ b/src/debuginfo.cpp
+@@ -287,6 +287,7 @@ public:
+             di->format = UNW_INFO_FORMAT_ARM_EXIDX;
+             di->start_ip = (uintptr_t)arm_text_addr;
+             di->end_ip = (uintptr_t)(arm_text_addr + arm_text_len);
++            di->load_offset = 0;
+             di->u.rti.name_ptr = 0;
+             di->u.rti.table_data = arm_exidx_addr;
+             di->u.rti.table_len = arm_exidx_len;
+@@ -1597,6 +1598,7 @@ void register_eh_frames(uint8_t *Addr, size_t Size)
+     di->u.rti.table_data = (unw_word_t)table;
+     di->start_ip = start_ip;
+     di->end_ip = end_ip;
++    di->load_offset = 0;
+ 
+     jl_profile_atomic([&]() {
+         _U_dyn_register(di);