From e737fe0c41f2c9cff8400defaab10908b553db18 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Sep 14 2020 16:20:51 +0000 Subject: Fix FTBFS --- diff --git a/scummvm-2.1.1-ftbfs-use-bfd-linker-on-x86.patch b/scummvm-2.1.1-ftbfs-use-bfd-linker-on-x86.patch new file mode 100644 index 0000000..fdae7fb --- /dev/null +++ b/scummvm-2.1.1-ftbfs-use-bfd-linker-on-x86.patch @@ -0,0 +1,15 @@ +diff -up scummvm-2.1.1/configure.me scummvm-2.1.1/configure +--- scummvm-2.1.1/configure.me 2020-09-14 16:56:27.269114787 +0200 ++++ scummvm-2.1.1/configure 2020-09-14 16:55:50.299579120 +0200 +@@ -5389,6 +5389,11 @@ EOF + ;; + esac + ++# used bdf linker on x86 as FTBFS workaround ++if test "$_have_x86" = yes ; then ++ set_var LDFLAGS "-fuse-ld=bfd" ++fi ++ + + # + # Check for nasm diff --git a/scummvm.spec b/scummvm.spec index 033c39c..ef2fb1b 100644 --- a/scummvm.spec +++ b/scummvm.spec @@ -14,7 +14,7 @@ Name: scummvm Version: 2.1.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Interpreter for several adventure games License: GPLv2+ URL: http://www.scummvm.org/ @@ -27,6 +27,8 @@ Patch0002: %{git_url}/pull/2079.patch#/%{name}-2.1.1-CONFIGURE_Add_compatibility # Properly apply LDFLAGS to plugins. From upstream pull-request. Patch0003: %{git_url}/pull/2082.patch#/%{name}-2.1.1-BUILD_Use_unmodified_SAVED_LDFLAGS_from_env_for_linking_plugins.patch Patch0004: gcc-lto.patch +Patch0005: scummvm-2.1.1-ftbfs-use-bfd-linker-on-x86.patch + # Needed for AppData check. BuildRequires: libappstream-glib speech-dispatcher-devel alsa-lib-devel BuildRequires: SDL2-devel libvorbis-devel flac-devel zlib-devel @@ -79,6 +81,11 @@ This package contains the data files for %{name}. # Disable LTO %define _lto_cflags %{nil} +# workaround FTBFS on i386 +%ifarch %{ix86} +export LDFLAGS="-fuse-ld=bfd" +%endif + # The configure script shall ignore the parameter for the --host option #passed by %%configure. export CONFIGURE_NO_HOST=true @@ -143,6 +150,9 @@ find $RPM_BUILD_ROOT%{_libdir} -type f -name '*.so' | xargs chmod -Rc 0755 %changelog +* Mon Sep 14 2020 Than Ngo - 2.1.1-11 +- Fix FTBFS + * Wed Sep 09 2020 Than Ngo - 2.1.1-10 - Rebuilt