summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2011-01-27 16:24:10 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-01-29 23:40:13 (GMT)
commit34c56e014ff44329416b609e1be208fd8e2ad4bf (patch)
treef656fb75f94adf246f9495ec6051ba094db7aa30
parent950a63a75383ec42795ec4a0c1559bbc832912be (diff)
downloadbuildroot-34c56e014ff44329416b609e1be208fd8e2ad4bf.tar.gz
buildroot-34c56e014ff44329416b609e1be208fd8e2ad4bf.tar.bz2
ntp: bump to version 4.2.6p3 and fix glibc build failure
Bump to version 4.2.6p3 and fix a build failure with external toolchains that use certain glibc versions as point out by speakman on IRC. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Acked-by: Daniel Nyström <daniel.nystrom@timeterminal.se> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/ntp/ntp-adjtimex.patch (renamed from package/ntp/ntp-4.2.6_p2-adjtimex.patch)0
-rw-r--r--package/ntp/ntp-nano.patch23
-rw-r--r--package/ntp/ntp.mk2
3 files changed, 24 insertions, 1 deletions
diff --git a/package/ntp/ntp-4.2.6_p2-adjtimex.patch b/package/ntp/ntp-adjtimex.patch
index 40625fa..40625fa 100644
--- a/package/ntp/ntp-4.2.6_p2-adjtimex.patch
+++ b/package/ntp/ntp-adjtimex.patch
diff --git a/package/ntp/ntp-nano.patch b/package/ntp/ntp-nano.patch
new file mode 100644
index 0000000..d16046c
--- /dev/null
+++ b/package/ntp/ntp-nano.patch
@@ -0,0 +1,23 @@
+Fixes issues with glibc header files, see
+http://bugs.gentoo.org/show_bug.cgi?id=270483
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura ntp-4.2.6p2.orig/include/ntp_syscall.h ntp-4.2.6p2/include/ntp_syscall.h
+--- ntp-4.2.6p2.orig/include/ntp_syscall.h 2009-12-09 04:36:37.000000000 -0300
++++ ntp-4.2.6p2/include/ntp_syscall.h 2011-01-27 13:09:05.072336628 -0300
+@@ -14,6 +14,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))
diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk
index 51e3956..7e09b5e 100644
--- a/package/ntp/ntp.mk
+++ b/package/ntp/ntp.mk
@@ -3,7 +3,7 @@
# ntp
#
#############################################################
-NTP_VERSION = 4.2.6p2
+NTP_VERSION = 4.2.6p3
NTP_SOURCE = ntp-$(NTP_VERSION).tar.gz
NTP_SITE = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2