From 5a6ce70f38086ba174d77355b850664d9853d711 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Aug 28 2020 20:52:09 +0000 Subject: Fix inline vs extern inline vs static inline issue and re-enable LTO --- diff --git a/adanaxisgpl-gcc11.patch b/adanaxisgpl-gcc11.patch new file mode 100644 index 0000000..5216b89 --- /dev/null +++ b/adanaxisgpl-gcc11.patch @@ -0,0 +1,13 @@ +diff --git a/src/MushRuby/lex.c b/src/MushRuby/lex.c +index a851447..f2f8396 100644 +--- a/src/MushRuby/lex.c ++++ b/src/MushRuby/lex.c +@@ -93,7 +93,7 @@ hash (str, len) + } + + #ifdef __GNUC__ +-__inline ++extern __inline + #endif + struct kwtable * + rb_reserved_word (str, len) diff --git a/adanaxisgpl.spec b/adanaxisgpl.spec index 6352a2e..415a799 100644 --- a/adanaxisgpl.spec +++ b/adanaxisgpl.spec @@ -1,13 +1,14 @@ Summary: Action game in four spatial dimensions Name: adanaxisgpl Version: 1.2.5 -Release: 37%{?dist} +Release: 38%{?dist} License: GPLv2 URL: http://www.mushware.com/ Source0: http://www.mushware.com/files/%{name}-1.2.5.tar.gz Patch0: adanaxisgpl-1.2.5-const.patch Patch1: adanaxisgpl-1.2.5-gcc47.patch Patch2: adanaxisgpl-1.2.5-xdg-open.patch +Patch3: adanaxisgpl-gcc11.patch BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: desktop-file-utils @@ -39,14 +40,10 @@ Shading Language. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build -# This package mis-uses inline vs extern inline for rb_reserved_word and -# if it does not get inlined, then we get an undefined symbol using LTO -# Disable LTO -%define _lto_cflags %{nil} - %configure make %{?_smp_mflags} @@ -97,6 +94,9 @@ install -p -m 644 x11/icons/%{name}-48.png %{buildroot}%{_datadir}/icons/hicolor %changelog +* Fri Aug 28 2020 Jeff Law - 1.2.5-38 +- Re-enable LTO + * Fri Jul 31 2020 Fedora Release Engineering - 1.2.5-37 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild