From 265508e7fc7abc980de47f478bab14fbe6f26a69 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 30 Mar 2020 01:25:45 +0200 Subject: [PATCH] avoid multiple definitions of an external var There's a missing "extern" symbol, causing build issues with newer toolchains. Signed-off-by: Mauro Carvalho Chehab --- rasdaemon-avoid-multiple-definitions.patch | 24 ++++++++++++++++++++++ rasdaemon.spec | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 rasdaemon-avoid-multiple-definitions.patch diff --git a/rasdaemon-avoid-multiple-definitions.patch b/rasdaemon-avoid-multiple-definitions.patch new file mode 100644 index 0000000..109587b --- /dev/null +++ b/rasdaemon-avoid-multiple-definitions.patch @@ -0,0 +1,24 @@ +commit fd982af0a307edc5d3e56011d2e045015b1efd4b +Author: Mauro Carvalho Chehab +Date: Mon Mar 30 01:22:24 2020 +0200 + + ras-record.h: define an external var as such + + Otherwise, newer versions of gcc will produce multiple symbols, + causing link breakages. + + Signed-off-by: Mauro Carvalho Chehab + +diff --git a/ras-record.h b/ras-record.h +index 5311c67caf44..0d2a481c23dd 100644 +--- a/ras-record.h ++++ b/ras-record.h +@@ -25,7 +25,7 @@ + + extern long user_hz; + +-struct ras_events *ras; ++extern struct ras_events *ras; + + struct ras_mc_event { + char timestamp[64]; diff --git a/rasdaemon.spec b/rasdaemon.spec index 5dd6303..8ddc3f7 100644 --- a/rasdaemon.spec +++ b/rasdaemon.spec @@ -5,6 +5,7 @@ Summary: Utility to receive RAS error tracings License: GPLv2 URL: http://git.infradead.org/users/mchehab/rasdaemon.git Source0: http://www.infradead.org/~mchehab/rasdaemon/%{name}-%{version}.tar.bz2 +Patch0: rasdaemon-avoid-multiple-definitions.patch ExcludeArch: s390 s390x BuildRequires: gcc @@ -35,6 +36,7 @@ an utility for reporting current error counts from the EDAC sysfs files. %prep %setup -q +%patch0 -p1 %build %ifarch %{arm} aarch64