Date: Thu, 29 Nov 2018 10:33:29 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486162 - head/sysutils/conky/files Message-ID: <201811291033.wATAXT3j044009@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Thu Nov 29 10:33:29 2018 New Revision: 486162 URL: https://svnweb.freebsd.org/changeset/ports/486162 Log: Fix build with GCC-based architectures. Fix changes the name of a variable to avoid clash with a function name defined in an include file used by GCC. PR: 233616 Submitted by: Piotr Kubaj <pkubaj@anongoth.pl> Added: head/sysutils/conky/files/patch-src_freebsd.cc (contents, props changed) Added: head/sysutils/conky/files/patch-src_freebsd.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/conky/files/patch-src_freebsd.cc Thu Nov 29 10:33:29 2018 (r486162) @@ -0,0 +1,23 @@ +--- src/freebsd.cc.orig 2018-11-28 18:50:47 UTC ++++ src/freebsd.cc +@@ -78,7 +78,7 @@ std::mutex kvm_proc_mutex; + __attribute__((gnu_inline)) inline void + proc_find_top(struct process **cpu, struct process **mem, struct process **time); + +-static short cpu_setup = 0; ++static short conky_cpu_setup = 0; + + static int getsysctl(const char *name, void *ptr, size_t len) + { +@@ -338,9 +338,9 @@ int update_cpu_usage(void) + extern void* global_cpu; + + /* add check for !info.cpu_usage since that mem is freed on a SIGUSR1 */ +- if ((cpu_setup == 0) || (!info.cpu_usage)) { ++ if ((conky_cpu_setup == 0) || (!info.cpu_usage)) { + get_cpu_count(); +- cpu_setup = 1; ++ conky_cpu_setup = 1; + } + + if (!global_cpu) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811291033.wATAXT3j044009>