Date: Tue, 7 Apr 2020 19:57:34 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531028 - head/net/ntp/files Message-ID: <202004071957.037JvY1H068957@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Tue Apr 7 19:57:34 2020 New Revision: 531028 URL: https://svnweb.freebsd.org/changeset/ports/531028 Log: ntpd: fix build with -fno-common Only a small nit here: psl should be declared extern and defined exactly once. -fno-common will become the default in GCC10/LLVM11. Obtained from: src r359676 (kevans) MFH: 2020Q2 Added: head/net/ntp/files/patch-include_ntp__config.h (contents, props changed) head/net/ntp/files/patch-ntpd_ntp__config.c (contents, props changed) Added: head/net/ntp/files/patch-include_ntp__config.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ntp/files/patch-include_ntp__config.h Tue Apr 7 19:57:34 2020 (r531028) @@ -0,0 +1,13 @@ +Index: include/ntp_config.h +=================================================================== +--- include/ntp_config.h (revision 359675) ++++ include/ntp_config.h (revision 359676) +@@ -280,7 +280,7 @@ + * Poll Skew List + */ + +-psl_item psl[17-3+1]; /* values for polls 3-17 */ ++extern psl_item psl[17-3+1]; /* values for polls 3-17 */ + /* To simplify the runtime code we */ + /* don't want to have to special-case */ + /* dealing with a default */ Added: head/net/ntp/files/patch-ntpd_ntp__config.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ntp/files/patch-ntpd_ntp__config.c Tue Apr 7 19:57:34 2020 (r531028) @@ -0,0 +1,13 @@ +Index: ntpd/ntp_config.c +=================================================================== +--- ntpd/ntp_config.c (revision 359675) ++++ ntpd/ntp_config.c (revision 359676) +@@ -202,6 +202,8 @@ + + extern char *stats_drift_file; /* name of the driftfile */ + ++psl_item psl[17-3+1]; ++ + #ifdef BC_LIST_FRAMEWORK_NOT_YET_USED + /* + * backwards compatibility flags
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004071957.037JvY1H068957>