From a862517ae0c509723f5986b89890a6788b887231f5fde6b36bd0c3790d841690 Mon Sep 17 00:00:00 2001 From: Soc Virnyl Estela Date: Wed, 15 May 2024 11:35:59 +0000 Subject: [PATCH] - Fix ./julia-libunwind-1.9.patch. OBS-URL: https://build.opensuse.org/package/show/science/julia?expand=0&rev=177 --- julia-libunwind-1.9.patch | 13 ++++++------- julia.changes | 5 +++++ julia.spec | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/julia-libunwind-1.9.patch b/julia-libunwind-1.9.patch index 8b204cb..f5fb94f 100644 --- a/julia-libunwind-1.9.patch +++ b/julia-libunwind-1.9.patch @@ -1,8 +1,7 @@ -diff --git a/src/debuginfo.cpp b/src/debuginfo.cpp -index 95b562311b..69fceb0cfe 100644 ---- a/src/debuginfo.cpp -+++ b/src/debuginfo.cpp -@@ -265,6 +265,7 @@ public: +diff -ruN julia-1.10.3.orig/src/debuginfo.cpp julia-1.10.3/src/debuginfo.cpp +--- julia-1.10.3.orig/src/debuginfo.cpp 2024-05-15 19:29:44.237505409 +0800 ++++ julia-1.10.3/src/debuginfo.cpp 2024-05-15 19:34:48.084228112 +0800 +@@ -267,6 +267,7 @@ 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); @@ -10,11 +9,11 @@ index 95b562311b..69fceb0cfe 100644 di->u.rti.name_ptr = 0; di->u.rti.table_data = arm_exidx_addr; di->u.rti.table_len = arm_exidx_len; -@@ -1577,6 +1578,7 @@ void register_eh_frames(uint8_t *Addr, size_t Size) +@@ -1579,6 +1580,7 @@ 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([&]() { + jl_profile_atomic([&]() JL_NOTSAFEPOINT { _U_dyn_register(di); diff --git a/julia.changes b/julia.changes index 81ace58..91f15ba 100644 --- a/julia.changes +++ b/julia.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 15 11:35:28 UTC 2024 - Soc Virnyl Estela + +- Fix ./julia-libunwind-1.9.patch. + ------------------------------------------------------------------- Wed May 15 10:24:04 UTC 2024 - Soc Virnyl Estela diff --git a/julia.spec b/julia.spec index 5183e64..1ad0993 100644 --- a/julia.spec +++ b/julia.spec @@ -66,7 +66,7 @@ Patch1: julia-env-script-interpreter.patch Patch2: disable-download-of-unicode-for-doc-gen.patch # PATCH-FIX-OPENSUSE -- Despite having no network, doc gen still wants to generate. Disabled with this patch. Patch3: disable-doc-gen-in-makefile.patch -# https://gitlab.archlinux.org/archlinux/packaging/packages/julia/-/raw/main/julia-libunwind-1.6.patch?ref_type=heads -- System libunwind compatibility +# Based on https://gitlab.archlinux.org/archlinux/packaging/packages/julia/-/raw/main/julia-libunwind-1.6.patch?ref_type=heads -- System libunwind compatibility Patch4: julia-libunwind-1.9.patch # Based of https://gitlab.archlinux.org/archlinux/packaging/packages/julia/-/raw/main/julia-libcholmod-cuda.patch?ref_type=heads -- we don't have NVIDIA or any CUDA platform by default Patch5: julia-remove-libcholmod_cuda.patch