From 87fa3cf8ec8022a6deac60bd1b7e655b6a7eb3f8 Mon Sep 17 00:00:00 2001 From: Milan Bouchet-Valat Date: Mar 23 2018 17:40:13 +0000 Subject: Fix build by removing libunwind version check --- diff --git a/julia.spec b/julia.spec index a689f62..2c7593c 100644 --- a/julia.spec +++ b/julia.spec @@ -5,7 +5,7 @@ Name: julia Version: 0.6.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: High-level, high-performance dynamic language for technical computing Group: Development/Languages # Julia itself is MIT, with a few LGPLv2+ and GPLv2+ files @@ -15,6 +15,7 @@ URL: http://julialang.org/ Source0: https://github.com/JuliaLang/julia/releases/download/v%{version}/julia-%{version}.tar.gz # Julia currently uses a custom version of libuv, patches are not yet upstream Source1: https://api.github.com/repos/JuliaLang/libuv/tarball/%{uvcommit}#/libuv-%{uvcommit}.tar.gz +Patch0: julia_unwind_version.patch Provides: bundled(libuv) = %{uvversion} BuildRequires: arpack-devel BuildRequires: desktop-file-utils @@ -98,6 +99,8 @@ Julia into external programs or debugging Julia itself. %prep %setup -q +%patch0 -p1 + mkdir -p deps/srccache pushd deps/srccache @@ -249,6 +252,9 @@ exit 0 /usr/bin/gtk-update-icon-cache %{_datarootdir}/icons/hicolor &>/dev/null || : %changelog +* Fri Mar 23 2018 Milan Bouchet-Valat - 0.6.2-3 +- Work around bug in UNW_VERSION_MINOR not being a single integer by removing redundant check. + * Wed Feb 07 2018 Fedora Release Engineering - 0.6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/julia_unwind_version.patch b/julia_unwind_version.patch new file mode 100644 index 0000000..e1df0b9 --- /dev/null +++ b/julia_unwind_version.patch @@ -0,0 +1,16 @@ +diff -ru a/src/julia_internal.h b/src/julia_internal.h +--- a/src/julia_internal.h 2017-12-13 20:01:57.000000000 +0100 ++++ b/src/julia_internal.h 2018-03-23 17:41:54.420474220 +0100 +@@ -642,12 +642,7 @@ + # include + typedef unw_context_t bt_context_t; + typedef unw_cursor_t bt_cursor_t; +-# if (!defined(SYSTEM_LIBUNWIND) || UNW_VERSION_MAJOR > 1 || \ +- (UNW_VERSION_MAJOR == 1 && UNW_VERSION_MINOR > 1)) +-// Enable our memory manager only for libunwind with our patch or +-// on a newer release + # define JL_UNW_HAS_FORMAT_IP 1 +-# endif + #endif + size_t rec_backtrace(uintptr_t *data, size_t maxsize); + size_t rec_backtrace_ctx(uintptr_t *data, size_t maxsize, bt_context_t *ctx);