From 4b637576cb70ead11190dba2cf6805aeb8a7c105a8cb422724d602b6a3ea1176 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 19 May 2020 12:25:58 +0000 Subject: [PATCH] Accepting request 804998 from home:Guillaume_G:branches:openSUSE:Factory:ARM - Disable LTO on aarch64 and armv7 - Add '-Wno-error=deprecated' to fix build on armv7 - Exclude armv6 since criu/arch/arm/bitops.S uses 'dmb ish' which is armv7+ OBS-URL: https://build.opensuse.org/request/show/804998 OBS-URL: https://build.opensuse.org/package/show/devel:tools/criu?expand=0&rev=95 --- criu.changes | 8 ++++++++ criu.spec | 11 +++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/criu.changes b/criu.changes index 46bea5b..21f2776 100644 --- a/criu.changes +++ b/criu.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed May 13 07:39:45 UTC 2020 - Guillaume GARDET + +- Disable LTO on aarch64 and armv7 +- Add '-Wno-error=deprecated' to fix build on armv7 +- Exclude armv6 since criu/arch/arm/bitops.S uses 'dmb ish' which + is armv7+ + ------------------------------------------------------------------- Mon Nov 18 16:47:34 CET 2019 - tiwai@suse.de diff --git a/criu.spec b/criu.spec index 64b7a4b..d4267e7 100644 --- a/criu.spec +++ b/criu.spec @@ -1,7 +1,7 @@ # # spec file for package criu # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,6 +21,10 @@ %define make_options USE_ASCIIDOCTOR=1 %endif +%ifarch %arm aarch64 +%define _lto_cflags %{nil} +%endif + Name: criu Version: 3.13 Release: 0 @@ -45,7 +49,7 @@ BuildRequires: xmlto %endif Requires: python3-ipaddr Requires: python3-protobuf -ExclusiveArch: x86_64 aarch64 ppc64le %{arm} s390x +ExclusiveArch: x86_64 aarch64 ppc64le armv7l armv7hl s390x %if 0%{?suse_version} > 1320 BuildRequires: libbsd-devel %endif @@ -95,6 +99,9 @@ echo "BINFMT_MISC_VIRTUALIZED" > .config %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects export CFLAGS="%{optflags}" +%ifarch %arm +export CFLAGS="$CFLAGS -Wno-error=deprecated" +%endif make V=1 %{?_smp_mflags} %{?make_options} %install