From 8263659dcc3ccfc52723a5ce6fb0ed64e8916400 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Tue, 23 Jun 2020 00:11:38 +0200 Subject: [PATCH] htop: fix compilation with gcc10 --- .../patches/htop-00-fix-gcc10-build.patch | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 packages/addons/addon-depends/system-tools-depends/htop/patches/htop-00-fix-gcc10-build.patch diff --git a/packages/addons/addon-depends/system-tools-depends/htop/patches/htop-00-fix-gcc10-build.patch b/packages/addons/addon-depends/system-tools-depends/htop/patches/htop-00-fix-gcc10-build.patch new file mode 100644 index 0000000000..6a2004b3cf --- /dev/null +++ b/packages/addons/addon-depends/system-tools-depends/htop/patches/htop-00-fix-gcc10-build.patch @@ -0,0 +1,52 @@ +From ee711740d2809e7aa3ebd57d58bfc02b1e9b034b Mon Sep 17 00:00:00 2001 +From: David Seifert +Date: Thu, 23 Jan 2020 17:27:10 +0100 +Subject: [PATCH] Fix GCC 10 switch to `-fno-common` default + +--- + CRT.h | 6 +++--- + linux/LinuxProcess.h | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/CRT.h b/CRT.h +index 933fe068..65998ac6 100644 +--- a/CRT.h ++++ b/CRT.h +@@ -140,7 +140,7 @@ extern const char **CRT_treeStr; + + extern int CRT_delay; + +-int* CRT_colors; ++extern int* CRT_colors; + + extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT]; + +@@ -150,13 +150,13 @@ extern int CRT_scrollHAmount; + + extern int CRT_scrollWheelVAmount; + +-char* CRT_termType; ++extern char* CRT_termType; + + // TODO move color scheme to Settings, perhaps? + + extern int CRT_colorScheme; + +-void *backtraceArray[128]; ++extern void *backtraceArray[128]; + + #if HAVE_SETUID_ENABLED + +diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h +index 6ce3037d..cbd77be9 100644 +--- a/linux/LinuxProcess.h ++++ b/linux/LinuxProcess.h +@@ -144,7 +144,7 @@ typedef struct LinuxProcess_ { + #endif + + +-long long btime; /* semi-global */ ++extern long long btime; /* semi-global */ + + extern ProcessFieldData Process_fields[]; +