diff options
| author | Niclas Zeising <zeising@FreeBSD.org> | 2020-08-22 08:34:21 +0000 |
|---|---|---|
| committer | Niclas Zeising <zeising@FreeBSD.org> | 2020-08-22 08:34:21 +0000 |
| commit | ed8689817ba5cb0311e434d75e795b92c54fe001 (patch) | |
| tree | b18a2ee1fda14d979ecbbc2e205d86724ebbb1a7 /sysutils | |
| parent | 95cfc359a042fe431623d7724ad610a9e1c33016 (diff) | |
| download | ports-ed8689817ba5cb0311e434d75e795b92c54fe001.tar.gz ports-ed8689817ba5cb0311e434d75e795b92c54fe001.zip | |
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)
Notes
Notes:
svn path=/branches/2020Q3/; revision=545749
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/htop/files/patch-CRT.h | 27 | ||||
| -rw-r--r-- | sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c | 13 | ||||
| -rw-r--r-- | sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h | 11 |
3 files changed, 50 insertions, 1 deletions
diff --git a/sysutils/htop/files/patch-CRT.h b/sysutils/htop/files/patch-CRT.h new file mode 100644 index 000000000000..8d63858b9b79 --- /dev/null +++ b/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 + diff --git a/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c b/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c index 2e98d6517454..27d72d1c32ad 100644 --- a/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c +++ b/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.c @@ -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 diff --git a/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h b/sysutils/htop/files/patch-freebsd_FreeBSDProcessList.h new file mode 100644 index 000000000000..5629c72e1c63 --- /dev/null +++ b/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_ { + |