summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-05-20 21:13:01 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-05-20 21:13:34 (GMT)
commit484d15dea6f3175eb5b999592a7f4bb9d101c68a (patch)
tree2ccfab03eba35af77cd406a995529fd86eb38d5a
parentc36e3f389695ef237b8c71aefeaf2d1b44c8034e (diff)
downloadbuildroot-484d15dea6f3175eb5b999592a7f4bb9d101c68a.tar.gz
buildroot-484d15dea6f3175eb5b999592a7f4bb9d101c68a.tar.bz2
ntp: fix build without ipv6 support
Closes #1693 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES6
-rw-r--r--package/ntp/ntp-optional-ipv6.patch24
2 files changed, 29 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index c69debc..8c6d645 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,11 @@
Fixes all over the tree.
- Updated/fixed packages: aumix, avahi, busybox, mtd-utils
+ Updated/fixed packages: aumix, avahi, busybox, mtd-utils, ntp
+
+ Issues resolved (http://bugs.uclibc.org):
+
+ #1693: NTP trys IPV6 even if not configured error: 'IPV6_MULTICAST...
2010.05-rc2, Released May 11th, 2010:
diff --git a/package/ntp/ntp-optional-ipv6.patch b/package/ntp/ntp-optional-ipv6.patch
new file mode 100644
index 0000000..20d6edf
--- /dev/null
+++ b/package/ntp/ntp-optional-ipv6.patch
@@ -0,0 +1,24 @@
+[PATCH] ntpd: fix build without ipv6 support
+
+ntp_io.c was checkin the non-existing DISABLE_IPV6 define rather
+than WANT_IPV6 as defined in config.h, breaking the build if
+the toolchain doesn't have ipv6 support.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ ntpd/ntp_io.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: ntp-4.2.4p5/ntpd/ntp_io.c
+===================================================================
+--- ntp-4.2.4p5.orig/ntpd/ntp_io.c
++++ ntp-4.2.4p5/ntpd/ntp_io.c
+@@ -55,7 +55,7 @@
+ * Set up some macros to look for IPv6 and IPv6 multicast
+ */
+
+-#if defined(ISC_PLATFORM_HAVEIPV6) && !defined(DISABLE_IPV6)
++#if defined(ISC_PLATFORM_HAVEIPV6) && defined(WANT_IPV6)
+
+ #define INCLUDE_IPV6_SUPPORT
+