svn commit: r545749 - branches/2020Q3/sysutils/htop/files
Niclas Zeising
zeising at FreeBSD.org
Sat Aug 22 08:34:22 UTC 2020
Author: zeising
Date: Sat Aug 22 08:34:21 2020
New Revision: 545749
URL: https://svnweb.freebsd.org/changeset/ports/545749
Log:
MFH: r545744
sysutils/htop: Fix build with -fno-common
Fix the build of sysutils/htop with -fno-common, which is the default in
llvm 11 (and gcc 10)
PR: 248823
Submitted by: Yasuhiro KIMURA
Approved by: ports-secteam (joenum, implicit, -fno-common fixes)
Added:
branches/2020Q3/sysutils/htop/files/patch-CRT.h
- copied unchanged from r545744, head/sysutils/htop/files/patch-CRT.h
branches/2020Q3/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h
- copied unchanged from r545744, head/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h
Modified:
branches/2020Q3/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c
Directory Properties:
branches/2020Q3/ (props changed)
Copied: branches/2020Q3/sysutils/htop/files/patch-CRT.h (from r545744, head/sysutils/htop/files/patch-CRT.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2020Q3/sysutils/htop/files/patch-CRT.h Sat Aug 22 08:34:21 2020 (r545749, copy of r545744, head/sysutils/htop/files/patch-CRT.h)
@@ -0,0 +1,27 @@
+--- CRT.h.orig 2018-04-10 13:42:59 UTC
++++ 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
+
Modified: branches/2020Q3/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c
==============================================================================
--- branches/2020Q3/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c Sat Aug 22 08:33:34 2020 (r545748)
+++ branches/2020Q3/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c Sat Aug 22 08:34:21 2020 (r545749)
@@ -4,7 +4,18 @@ https://github.com/hishamhm/htop/pull/871
--- freebsd/FreeBSDProcessList.c.orig 2018-04-10 13:42:59 UTC
+++ freebsd/FreeBSDProcessList.c
-@@ -296,31 +296,46 @@ static inline void FreeBSDProcessList_scanMemoryInfo(P
+@@ -28,8 +28,9 @@ in the source distribution for its full text.
+ #include <sys/resource.h>
+
+ #define JAIL_ERRMSGLEN 1024
++*/
+ char jail_errmsg[JAIL_ERRMSGLEN];
+-
++/*
+ typedef struct CPUData_ {
+
+ double userPercent;
+@@ -296,31 +297,46 @@ static inline void FreeBSDProcessList_scanMemoryInfo(P
//
// htop_used = active + (wired - arc)
// htop_cache = buffers + cache + arc
Copied: branches/2020Q3/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h (from r545744, head/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2020Q3/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h Sat Aug 22 08:34:21 2020 (r545749, copy of r545744, head/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h)
@@ -0,0 +1,11 @@
+--- freebsd/FreeBSDProcessList.h.orig 2018-04-10 13:42:59 UTC
++++ freebsd/FreeBSDProcessList.h
+@@ -17,7 +17,7 @@ in the source distribution for its full text.
+ #include <sys/resource.h>
+
+ #define JAIL_ERRMSGLEN 1024
+-char jail_errmsg[JAIL_ERRMSGLEN];
++extern char jail_errmsg[JAIL_ERRMSGLEN];
+
+ typedef struct CPUData_ {
+
More information about the svn-ports-all
mailing list