svn commit: r545744 - head/sysutils/htop/files

[Niclas Zeising]

Author: zeising
Date: Sat Aug 22 08:25:50 2020
New Revision: 545744
URL: https://svnweb.freebsd.org/changeset/ports/545744

Log:
  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
  MFH:		2020Q3 (iplicit, -fno-common fixes, ok by joenum)

Added:
  head/sysutils/htop/files/patch-CRT.h   (contents, props changed)
  head/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h   (contents, props changed)
Modified:
  head/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c

Added: head/sysutils/htop/files/patch-CRT.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/htop/files/patch-CRT.h	Sat Aug 22 08:25:50 2020	(r545744)
@@ -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: head/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c
==============================================================================
--- head/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c	Sat Aug 22 07:49:21 2020	(r545743)
+++ head/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c	Sat Aug 22 08:25:50 2020	(r545744)
@@ -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

Added: head/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h	Sat Aug 22 08:25:50 2020	(r545744)
@@ -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_ {
+