diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-05-05 16:54:02 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-05-08 09:05:18 +0200 |
| commit | d69cec0aadfa65148ae07220bedd4b4d7191f9dc (patch) | |
| tree | 12e576f8fa46626767b2a2c5efe772e2b4c77cb1 /patches | |
| parent | 08a9a9979d8684796babca8c495079f15acf4ed2 (diff) | |
| download | ptxdist-d69cec0aadfa65148ae07220bedd4b4d7191f9dc.tar.gz ptxdist-d69cec0aadfa65148ae07220bedd4b4d7191f9dc.tar.xz | |
htop: add fix to build with gcc 10
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/htop-2.2.0/0001-Fix-GCC-10-switch-to-fno-common-default.patch | 37 | ||||
| -rw-r--r-- | patches/htop-2.2.0/series | 4 |
2 files changed, 41 insertions, 0 deletions
diff --git a/patches/htop-2.2.0/0001-Fix-GCC-10-switch-to-fno-common-default.patch b/patches/htop-2.2.0/0001-Fix-GCC-10-switch-to-fno-common-default.patch new file mode 100644 index 000000000..9bc8be048 --- /dev/null +++ b/patches/htop-2.2.0/0001-Fix-GCC-10-switch-to-fno-common-default.patch @@ -0,0 +1,37 @@ +From: David Seifert <soap@gentoo.org> +Date: Thu, 23 Jan 2020 17:27:10 +0100 +Subject: [PATCH] Fix GCC 10 switch to `-fno-common` default + +--- + CRT.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CRT.h b/CRT.h +index 933fe068eda4..65998ac6c55e 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/patches/htop-2.2.0/series b/patches/htop-2.2.0/series new file mode 100644 index 000000000..8f680c947 --- /dev/null +++ b/patches/htop-2.2.0/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Fix-GCC-10-switch-to-fno-common-default.patch +# 6475f89c48f4d2f8f44c241a7e57e3dd - git-ptx-patches magic |