1 |
commit: d73d1c70594d18629f3ff35896363cc33aa1fad6 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 11 10:59:33 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 11 10:59:33 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d73d1c70 |
7 |
|
8 |
sys-process/htop: Fix building with -fno-common |
9 |
|
10 |
Closes: https://bugs.gentoo.org/706358 |
11 |
Package-Manager: Portage-2.3.88, Repoman-2.3.20 |
12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
13 |
|
14 |
sys-process/htop/files/htop-2.2.0-gcc-10.patch | 27 ++++++++++++++++++++++++++ |
15 |
sys-process/htop/htop-2.2.0.ebuild | 1 + |
16 |
2 files changed, 28 insertions(+) |
17 |
|
18 |
diff --git a/sys-process/htop/files/htop-2.2.0-gcc-10.patch b/sys-process/htop/files/htop-2.2.0-gcc-10.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..dc49b0bb850 |
21 |
--- /dev/null |
22 |
+++ b/sys-process/htop/files/htop-2.2.0-gcc-10.patch |
23 |
@@ -0,0 +1,27 @@ |
24 |
+--- a/CRT.h |
25 |
++++ b/CRT.h |
26 |
+@@ -140,7 +140,7 @@ extern const char **CRT_treeStr; |
27 |
+ |
28 |
+ extern int CRT_delay; |
29 |
+ |
30 |
+-int* CRT_colors; |
31 |
++extern int* CRT_colors; |
32 |
+ |
33 |
+ extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT]; |
34 |
+ |
35 |
+@@ -150,13 +150,13 @@ extern int CRT_scrollHAmount; |
36 |
+ |
37 |
+ extern int CRT_scrollWheelVAmount; |
38 |
+ |
39 |
+-char* CRT_termType; |
40 |
++extern char* CRT_termType; |
41 |
+ |
42 |
+ // TODO move color scheme to Settings, perhaps? |
43 |
+ |
44 |
+ extern int CRT_colorScheme; |
45 |
+ |
46 |
+-void *backtraceArray[128]; |
47 |
++extern void *backtraceArray[128]; |
48 |
+ |
49 |
+ #if HAVE_SETUID_ENABLED |
50 |
+ |
51 |
|
52 |
diff --git a/sys-process/htop/htop-2.2.0.ebuild b/sys-process/htop/htop-2.2.0.ebuild |
53 |
index 8e121bcacff..318bdf97c5c 100644 |
54 |
--- a/sys-process/htop/htop-2.2.0.ebuild |
55 |
+++ b/sys-process/htop/htop-2.2.0.ebuild |
56 |
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND} |
57 |
${PYTHON_DEPS} |
58 |
virtual/pkgconfig" |
59 |
|
60 |
+PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch ) |
61 |
DOCS=( ChangeLog README ) |
62 |
|
63 |
CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS" |