diff options
author | sjmulder <sjmulder@pkgsrc.org> | 2020-10-07 09:09:39 +0000 |
---|---|---|
committer | sjmulder <sjmulder@pkgsrc.org> | 2020-10-07 09:09:39 +0000 |
commit | d4263c3410e4842fad7a1b904caa5dfff763a780 (patch) | |
tree | 9764e8d290d60e6303e3d061dd2670156dbf5ced /net/ntp4 | |
parent | a21b6d4ca9cd748e8a3dfc658fa414f447033c64 (diff) | |
download | pkgsrc-d4263c3410e4842fad7a1b904caa5dfff763a780.tar.gz |
net/ntp4: Fix Linux build
Diffstat (limited to 'net/ntp4')
-rw-r--r-- | net/ntp4/distinfo | 6 | ||||
-rw-r--r-- | net/ntp4/patches/patch-ntpd_refclock__wwvb.c | 9 | ||||
-rw-r--r-- | net/ntp4/patches/patch-sntp_libopts_autoopts.h | 19 |
3 files changed, 20 insertions, 14 deletions
diff --git a/net/ntp4/distinfo b/net/ntp4/distinfo index 88958e991ca..430558b9930 100644 --- a/net/ntp4/distinfo +++ b/net/ntp4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.32 2020/08/15 02:09:25 tnn Exp $ +$NetBSD: distinfo,v 1.33 2020/10/07 09:09:39 sjmulder Exp $ SHA1 (ntp-4.2.8p15.tar.gz) = e34e5b6f48c3ed1bbcfb03080dec1b8f91e19381 RMD160 (ntp-4.2.8p15.tar.gz) = 4653211d8c258a4a9edf1b2445a77223330176a2 @@ -27,13 +27,13 @@ SHA1 (patch-ntpd_refclock__jupiter.c) = bb248d2766cadddacdf9cb56bf9b29cbc538bbcb SHA1 (patch-ntpd_refclock__neoclock4x.c) = 66c38ba21572cb8804a39766f3b32d1b65cb0946 SHA1 (patch-ntpd_refclock__oncore.c) = d93efa11cadc37fd9e600f80f2cbf0280be969c6 SHA1 (patch-ntpd_refclock__ulink.c) = 55003f758fd71621db60ffad8a1880588098389e -SHA1 (patch-ntpd_refclock__wwvb.c) = e1a7fc80df6dba9595788a8b8c56729619048ee4 +SHA1 (patch-ntpd_refclock__wwvb.c) = 3a8003bcd94f74a4e1914054d5d30751feb97825 SHA1 (patch-ntpdate_ntpdate.c) = 17e2534ab7a54e5af16059ca8c02c9995d79d83c SHA1 (patch-ntpdc_Makefile.in) = 6afaf915ee8c6b244f94d3733545231e69dfd14d SHA1 (patch-ntpq_ntpq.c) = 0776827a712e2f6636b9d322ae7445d184f3709f SHA1 (patch-sntp_libevent_build-aux_config.guess) = 5f5fff42d04daef5fcbba2bc09b015fb4489ca59 SHA1 (patch-sntp_libevent_build-aux_config.sub) = 178e8b39138e49db7702c4bb84fe92550d14a978 -SHA1 (patch-sntp_libopts_autoopts.h) = d4cbaa31df97e04f3637349a3d5eb1addfa847db +SHA1 (patch-sntp_libopts_autoopts.h) = 9f46171eb6982d1ee57b70286e9436aef763554d SHA1 (patch-sntp_libopts_enum.c) = 7d6624ed84a6ea6f85b4de4c37480041a7603252 SHA1 (patch-sntp_libopts_usage.c) = ec77942c98965c13de625b930db3458d5b81d28b SHA1 (patch-sntp_loc_pkgsrc) = 6e46ffc0cc2afcfdc1d01297cbe04cb80d103575 diff --git a/net/ntp4/patches/patch-ntpd_refclock__wwvb.c b/net/ntp4/patches/patch-ntpd_refclock__wwvb.c index 940e8e28b33..880b852d7ee 100644 --- a/net/ntp4/patches/patch-ntpd_refclock__wwvb.c +++ b/net/ntp4/patches/patch-ntpd_refclock__wwvb.c @@ -1,16 +1,15 @@ -$NetBSD: patch-ntpd_refclock__wwvb.c,v 1.1 2020/06/21 15:10:47 taca Exp $ +$NetBSD: patch-ntpd_refclock__wwvb.c,v 1.2 2020/10/07 09:09:39 sjmulder Exp $ -* Changes from NetBSD base. +* Changes from NetBSD base w/ Linux fix --- ntpd/refclock_wwvb.c.orig 2014-12-30 00:29:38.000000000 +0000 +++ ntpd/refclock_wwvb.c -@@ -154,7 +154,8 @@ static void wwvb_control (int, const str +@@ -154,7 +154,7 @@ static void wwvb_control (int, const str struct refclockstat *, struct peer *); #define WWVB_CONTROL wwvb_control #else -#define WWVB_CONTROL noentry -+#define WWVB_CONTROL (void)(*) -+noentry ++#define WWVB_CONTROL (void*)noentry #endif /* HAVE_PPSAPI */ /* diff --git a/net/ntp4/patches/patch-sntp_libopts_autoopts.h b/net/ntp4/patches/patch-sntp_libopts_autoopts.h index e7c8fbd5609..18d8e08ed19 100644 --- a/net/ntp4/patches/patch-sntp_libopts_autoopts.h +++ b/net/ntp4/patches/patch-sntp_libopts_autoopts.h @@ -1,22 +1,29 @@ -$NetBSD: patch-sntp_libopts_autoopts.h,v 1.1 2020/06/21 15:10:47 taca Exp $ +$NetBSD: patch-sntp_libopts_autoopts.h,v 1.2 2020/10/07 09:09:39 sjmulder Exp $ * Changes from NetBSD base. +* Compat for noreturn on old compilers --- sntp/libopts/autoopts.h.orig 2015-04-26 18:43:14.000000000 +0000 +++ sntp/libopts/autoopts.h -@@ -32,7 +32,11 @@ +@@ -32,7 +32,16 @@ #ifndef AUTOGEN_AUTOOPTS_H #define AUTOGEN_AUTOOPTS_H -+#if 0 - #include <stdnoreturn.h> +-#include <stdnoreturn.h> ++ ++#if __STDC_VERSION__-0 >= 201112L ++# include <stdnoreturn.h> ++#elif defined(__GNUC__) ++# define noreturn __attribute__((noreturn)) ++#elif defined(__NetBSD__) ++# define noreturn __dead +#else -+#define noreturn __dead ++# define noreturn +#endif #define AO_NAME_LIMIT 127 #define AO_NAME_SIZE ((size_t)(AO_NAME_LIMIT + 1)) -@@ -452,7 +456,7 @@ typedef enum { AOFLAG_TABLE } ao_flags_t +@@ -452,7 +461,7 @@ typedef enum { AOFLAG_TABLE } ao_flags_t #undef _aof_ static char const zNil[] = ""; |