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 <mchehab+huawei@kernel.org>
This commit is contained in:
parent
f3b346e8be
commit
265508e7fc
24
rasdaemon-avoid-multiple-definitions.patch
Normal file
24
rasdaemon-avoid-multiple-definitions.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
commit fd982af0a307edc5d3e56011d2e045015b1efd4b
|
||||||
|
Author: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
|
||||||
|
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 <mchehab+huawei@kernel.org>
|
||||||
|
|
||||||
|
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];
|
@ -5,6 +5,7 @@ Summary: Utility to receive RAS error tracings
|
|||||||
License: GPLv2
|
License: GPLv2
|
||||||
URL: http://git.infradead.org/users/mchehab/rasdaemon.git
|
URL: http://git.infradead.org/users/mchehab/rasdaemon.git
|
||||||
Source0: http://www.infradead.org/~mchehab/rasdaemon/%{name}-%{version}.tar.bz2
|
Source0: http://www.infradead.org/~mchehab/rasdaemon/%{name}-%{version}.tar.bz2
|
||||||
|
Patch0: rasdaemon-avoid-multiple-definitions.patch
|
||||||
|
|
||||||
ExcludeArch: s390 s390x
|
ExcludeArch: s390 s390x
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
@ -35,6 +36,7 @@ an utility for reporting current error counts from the EDAC sysfs files.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%ifarch %{arm} aarch64
|
%ifarch %{arm} aarch64
|
||||||
|
Loading…
Reference in New Issue
Block a user