From b713ff1e5933d5686023f06fc33c96202702104deed68d79b084d04c1a019b5d Mon Sep 17 00:00:00 2001 From: Bruce Rogers Date: Thu, 17 Oct 2019 14:09:45 +0000 Subject: [PATCH] Accepting request 739091 from home:lnussel:branches:Virtualization - use %gcc_version for cross compilers (boo#1153703) OBS-URL: https://build.opensuse.org/request/show/739091 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=500 --- qemu.changes | 5 +++++ qemu.spec | 24 ++++-------------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/qemu.changes b/qemu.changes index 3df26708..907ebc21 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 17 09:15:07 UTC 2019 - Ludwig Nussel + +- use %gcc_version for cross compilers (boo#1153703) + ------------------------------------------------------------------- Tue Oct 15 20:13:27 UTC 2019 - Bruce Rogers diff --git a/qemu.spec b/qemu.spec index 87965618..7e210720 100644 --- a/qemu.spec +++ b/qemu.spec @@ -257,35 +257,19 @@ BuildRequires: bluez-devel BuildRequires: brlapi-devel %ifnarch %{ix86} aarch64 BuildRequires: cross-aarch64-binutils -%if 0%{suse_version} > 1500 -BuildRequires: cross-aarch64-gcc9 -%else -BuildRequires: cross-aarch64-gcc7 -%endif +BuildRequires: cross-aarch64-gcc%gcc_version %endif %ifnarch %{ix86} armv7hl BuildRequires: cross-arm-binutils -%if 0%{suse_version} > 1500 -BuildRequires: cross-arm-gcc9 -%else -BuildRequires: cross-arm-gcc7 -%endif +BuildRequires: cross-arm-gcc%gcc_version %endif %if %{build_x86_firmware_from_source} %ifnarch %{ix86} x86_64 # We must cross-compile on non-x86* BuildRequires: cross-i386-binutils -%if 0%{suse_version} > 1500 -BuildRequires: cross-i386-gcc9 -%else -BuildRequires: cross-i386-gcc7 -%endif +BuildRequires: cross-i386-gcc%gcc_version BuildRequires: cross-x86_64-binutils -%if 0%{suse_version} > 1500 -BuildRequires: cross-x86_64-gcc9 -%else -BuildRequires: cross-x86_64-gcc7 -%endif +BuildRequires: cross-x86_64-gcc%gcc_version %endif %endif BuildRequires: curl-devel