| 1 |
commit: 5fa347583c1bf30e212cb38d529bbed3d233c9cc |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 11 11:22:36 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 11 11:22:36 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fa34758 |
| 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 |
.../htop/files/htop-3.0.0_beta5-gcc-10.patch | 52 ++++++++++++++++++++++ |
| 15 |
sys-process/htop/htop-3.0.0_beta5.ebuild | 4 +- |
| 16 |
2 files changed, 54 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-process/htop/files/htop-3.0.0_beta5-gcc-10.patch b/sys-process/htop/files/htop-3.0.0_beta5-gcc-10.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..6a2004b3cf7 |
| 21 |
--- /dev/null |
| 22 |
+++ b/sys-process/htop/files/htop-3.0.0_beta5-gcc-10.patch |
| 23 |
@@ -0,0 +1,52 @@ |
| 24 |
+From ee711740d2809e7aa3ebd57d58bfc02b1e9b034b Mon Sep 17 00:00:00 2001 |
| 25 |
+From: David Seifert <soap@g.o> |
| 26 |
+Date: Thu, 23 Jan 2020 17:27:10 +0100 |
| 27 |
+Subject: [PATCH] Fix GCC 10 switch to `-fno-common` default |
| 28 |
+ |
| 29 |
+--- |
| 30 |
+ CRT.h | 6 +++--- |
| 31 |
+ linux/LinuxProcess.h | 2 +- |
| 32 |
+ 2 files changed, 4 insertions(+), 4 deletions(-) |
| 33 |
+ |
| 34 |
+diff --git a/CRT.h b/CRT.h |
| 35 |
+index 933fe068..65998ac6 100644 |
| 36 |
+--- a/CRT.h |
| 37 |
++++ b/CRT.h |
| 38 |
+@@ -140,7 +140,7 @@ extern const char **CRT_treeStr; |
| 39 |
+ |
| 40 |
+ extern int CRT_delay; |
| 41 |
+ |
| 42 |
+-int* CRT_colors; |
| 43 |
++extern int* CRT_colors; |
| 44 |
+ |
| 45 |
+ extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT]; |
| 46 |
+ |
| 47 |
+@@ -150,13 +150,13 @@ extern int CRT_scrollHAmount; |
| 48 |
+ |
| 49 |
+ extern int CRT_scrollWheelVAmount; |
| 50 |
+ |
| 51 |
+-char* CRT_termType; |
| 52 |
++extern char* CRT_termType; |
| 53 |
+ |
| 54 |
+ // TODO move color scheme to Settings, perhaps? |
| 55 |
+ |
| 56 |
+ extern int CRT_colorScheme; |
| 57 |
+ |
| 58 |
+-void *backtraceArray[128]; |
| 59 |
++extern void *backtraceArray[128]; |
| 60 |
+ |
| 61 |
+ #if HAVE_SETUID_ENABLED |
| 62 |
+ |
| 63 |
+diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h |
| 64 |
+index 6ce3037d..cbd77be9 100644 |
| 65 |
+--- a/linux/LinuxProcess.h |
| 66 |
++++ b/linux/LinuxProcess.h |
| 67 |
+@@ -144,7 +144,7 @@ typedef struct LinuxProcess_ { |
| 68 |
+ #endif |
| 69 |
+ |
| 70 |
+ |
| 71 |
+-long long btime; /* semi-global */ |
| 72 |
++extern long long btime; /* semi-global */ |
| 73 |
+ |
| 74 |
+ extern ProcessFieldData Process_fields[]; |
| 75 |
+ |
| 76 |
|
| 77 |
diff --git a/sys-process/htop/htop-3.0.0_beta5.ebuild b/sys-process/htop/htop-3.0.0_beta5.ebuild |
| 78 |
index 9ee89943272..3351359ceb6 100644 |
| 79 |
--- a/sys-process/htop/htop-3.0.0_beta5.ebuild |
| 80 |
+++ b/sys-process/htop/htop-3.0.0_beta5.ebuild |
| 81 |
@@ -30,9 +30,9 @@ DOCS=( ChangeLog README ) |
| 82 |
CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS" |
| 83 |
|
| 84 |
PATCHES=( |
| 85 |
- |
| 86 |
# Fixes from upstream (can usually be removed with next version bump) |
| 87 |
- "${FILESDIR}/${PN}-2.1.0-header_updates.patch" |
| 88 |
+ "${FILESDIR}"/${PN}-2.1.0-header_updates.patch |
| 89 |
+ "${FILESDIR}"/${PN}-3.0.0_beta5-gcc-10.patch |
| 90 |
) |
| 91 |
|
| 92 |
pkg_setup() { |
Archives