| 1 |
commit: acf6a6498bfbb0294a07072c6acb8cfadcb56695 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 2 18:59:34 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 2 18:59:50 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acf6a649 |
| 7 |
|
| 8 |
net-misc/ntp: fix building against GCC 10 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/707688 |
| 11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 13 |
|
| 14 |
.../ntp/files/ntp-4.2.8-gcc10-fno-common.patch | 22 ++++++++++++++++++++++ |
| 15 |
net-misc/ntp/ntp-4.2.8_p14-r2.ebuild | 1 + |
| 16 |
2 files changed, 23 insertions(+) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..d2ed719d8ff |
| 21 |
--- /dev/null |
| 22 |
+++ b/net-misc/ntp/files/ntp-4.2.8-gcc10-fno-common.patch |
| 23 |
@@ -0,0 +1,22 @@ |
| 24 |
+--- ntp-4.2.8p14/include/ntp_config.h.psl |
| 25 |
++++ ntp-4.2.8p14/include/ntp_config.h |
| 26 |
+@@ -280,7 +280,7 @@ typedef struct settrap_parms_tag { |
| 27 |
+ * Poll Skew List |
| 28 |
+ */ |
| 29 |
+ |
| 30 |
+-psl_item psl[17-3+1]; /* values for polls 3-17 */ |
| 31 |
++extern psl_item psl[17-3+1]; /* values for polls 3-17 */ |
| 32 |
+ /* To simplify the runtime code we */ |
| 33 |
+ /* don't want to have to special-case */ |
| 34 |
+ /* dealing with a default */ |
| 35 |
+--- ntp-4.2.8p14/ntpd/ntp_config.c.psl |
| 36 |
++++ ntp-4.2.8p14/ntpd/ntp_config.c |
| 37 |
+@@ -202,6 +202,8 @@ int cryptosw; /* crypto command called |
| 38 |
+ |
| 39 |
+ extern char *stats_drift_file; /* name of the driftfile */ |
| 40 |
+ |
| 41 |
++psl_item psl[17-3+1]; /* values for polls 3-17 */ |
| 42 |
++ |
| 43 |
+ #ifdef BC_LIST_FRAMEWORK_NOT_YET_USED |
| 44 |
+ /* |
| 45 |
+ * backwards compatibility flags |
| 46 |
|
| 47 |
diff --git a/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild |
| 48 |
index b2cbb8b926a..79a6d513fa4 100644 |
| 49 |
--- a/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild |
| 50 |
+++ b/net-misc/ntp/ntp-4.2.8_p14-r2.ebuild |
| 51 |
@@ -48,6 +48,7 @@ PATCHES=( |
| 52 |
"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch |
| 53 |
"${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch |
| 54 |
"${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530 |
| 55 |
+ "${FILESDIR}"/${PN}-4.2.8-gcc10-fno-common.patch |
| 56 |
) |
| 57 |
|
| 58 |
src_prepare() { |
Archives