Thu Oct 29 11:23:47 2015 UTC ()
- rename patch-aa to follow not so new anymore convention
- apply the "warmup" patch only on linux. should fix the build on netbsd-6
(christos)
diff -r1.11 -r0 pkgsrc/net/ntp4/patches/patch-aa
diff -r0 -r1.1 pkgsrc/net/ntp4/patches/patch-include-ntp__syscall.h
diff -r0 -r1.1 pkgsrc/net/ntp4/patches/patch-ntpd-ntpd.c
$NetBSD: patch-include-ntp__syscall.h,v 1.1 2015/10/29 11:23:47 christos Exp $
--- include/ntp_syscall.h.orig 2011-03-31 10:03:53.000000000 +0000
+++ include/ntp_syscall.h
@@ -10,6 +10,14 @@
# include <sys/timex.h>
#endif
+#if defined(ADJ_NANO) && !defined(MOD_NANO)
+#define MOD_NANO ADJ_NANO
+#endif
+
+#if defined(ADJ_TAI) && !defined(MOD_TAI)
+#define MOD_TAI ADJ_TAI
+#endif
+
#ifndef NTP_SYSCALLS_LIBC
# ifdef NTP_SYSCALLS_STD
# define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t))
$NetBSD: patch-ntpd-ntpd.c,v 1.1 2015/10/29 11:23:47 christos Exp $
Apply the stupid glibc "warmup" only on linux
--- ntpd/ntpd.c.orig 2015-10-21 12:14:24.000000000 -0400
+++ ntpd/ntpd.c 2015-10-29 07:20:41.000000000 -0400
@@ -32,7 +32,9 @@
# ifdef HAVE_PTHREAD_H
# include <pthread.h>
# endif
-# define NEED_PTHREAD_WARMUP
+# ifdef __linux__
+# define NEED_PTHREAD_WARMUP
+# endif
#endif
#ifdef HAVE_UNISTD_H