From 966b4d2a75ccf720e5f015aecd2be7d5d5cf8bc7ebfa7afcc638defd68ddd940 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Tue, 10 Dec 2019 11:14:32 +0000 Subject: [PATCH] Accepting request 755273 from home:cgiboudeaux:branches:games - Undefine _lto_cflags before building scummvm. The lto flags are incompatible with -gsplit-dwarf which scummvm relies on. OBS-URL: https://build.opensuse.org/request/show/755273 OBS-URL: https://build.opensuse.org/package/show/games/scummvm?expand=0&rev=55 --- scummvm.changes | 6 ++++++ scummvm.spec | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/scummvm.changes b/scummvm.changes index 50693a1..d756d97 100644 --- a/scummvm.changes +++ b/scummvm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 9 15:01:25 UTC 2019 - Christophe Giboudeaux + +- Undefine _lto_cflags before building scummvm. The lto flags are + incompatible with -gsplit-dwarf which scummvm relies on. + ------------------------------------------------------------------- Sat Oct 12 12:38:37 UTC 2019 - Luigi Baldoni diff --git a/scummvm.spec b/scummvm.spec index 36ed8da..fc8bac9 100644 --- a/scummvm.spec +++ b/scummvm.spec @@ -1,7 +1,7 @@ # # spec file for package scummvm # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -84,6 +84,9 @@ These engines are in a worse state, but allow to play extra games. sed -i '/tmp_endianness_check.cpp/ s/$CXXFLAGS/$CXXFLAGS -fno-lto -O0/' configure %build +# scummvm relies on -gsplit-dwarf which is incompatible with -flto +%define _lto_cflags %{nil} + # No rpm configure because scummvm's configure isn't a real configure and thus # doesn't understand some of the options %%configure passes. CXXFLAGS="%{optflags}" ; export CXXFLAGS ; \