NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/trinity: fix build with gcc 10

Browse Source 
Fixes:
 - http://autobuild.buildroot.org/results/bac2cbc791e2ab1d0995c8417bd3d19cbc884e47

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine 2020-09-10 19:00:59 +02:00 committed by Peter Korsgaard
parent 14efb32559
commit b1bc703ee4
1 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
package/trinity/0001-Fix-build-with-GCC-10.patch Normal file
View File

@ -0,0 +1,38 @@
From e53e25cc8dd5bdb5f7d9b4247de9e9921eec81d8 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@freedesktop.org>
Date: Thu, 30 Jan 2020 22:09:45 -0800
Subject: [PATCH] Fix build with GCC 10.
CC trinity
/usr/bin/ld: debug.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
/usr/bin/ld: log-files.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
/usr/bin/ld: log.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
/usr/bin/ld: main.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
/usr/bin/ld: output.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
/usr/bin/ld: params.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
/usr/bin/ld: shm.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
/usr/bin/ld: trinity.o:include/logfile.h:8: multiple definition of `mainlogfile'; child.o:include/logfile.h:8: first defined here
Fixes: 13856316c259 ("reinstate the log-to-file code for now.")
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
[Retrieved from:
https://github.com/kernelslacker/trinity/commit/e53e25cc8dd5bdb5f7d9b4247de9e9921eec81d8]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
include/logfile.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/logfile.h b/include/logfile.h
index 90ea8b23..2305ac15 100644
--- a/include/logfile.h
+++ b/include/logfile.h
@@ -5,7 +5,7 @@
FILE *find_logfile_handle(void);
void synclogs(void);
-FILE *mainlogfile;
+extern FILE *mainlogfile;
void open_main_logfile(void);
void close_logfile(FILE **handle);