commit: acf6a6498bfbb0294a07072c6acb8cfadcb56695 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Sat May 2 18:59:34 2020 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Sat May 2 18:59:50 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acf6a649
net-misc/ntp: fix building against GCC 10 Closes: https://bugs.gentoo.org/707688 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> .../ntp/files/ntp-4.2.8-gcc10-fno-common.patch | 22 ++++++++++++++++++++++ net-misc/ntp/ntp-4.2.8_p14-r2.ebuild | 1 + 2 files changed, 23 insertions(+) diff --git a/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch b/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch new file mode 100644 index 00000000000..d2ed719d8ff --- /dev/null +++ b/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch @@ -0,0 +1,22 @@ +--- ntp-4.2.8p14/include/ntp_config.h.psl ++++ ntp-4.2.8p14/include/ntp_config.h +@@ -280,7 +280,7 @@ typedef struct settrap_parms_tag { + * 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 */ +--- ntp-4.2.8p14/ntpd/ntp_config.c.psl ++++ ntp-4.2.8p14/ntpd/ntp_config.c +@@ -202,6 +202,8 @@ int cryptosw; /* crypto command called + + extern char *stats_drift_file; /* name of the driftfile */ + ++psl_item psl[17-3+1]; /* values for polls 3-17 */ ++ + #ifdef BC_LIST_FRAMEWORK_NOT_YET_USED + /* + * backwards compatibility flags diff --git a/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild index b2cbb8b926a..79a6d513fa4 100644 --- a/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild @@ -48,6 +48,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch "${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch "${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530 + "${FILESDIR}"/${PN}-4.2.8-gcc10-fno-common.patch ) src_prepare() {
