summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Zabel <philipp.zabel@gmail.com>2006-03-15 16:56:00 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-03-15 16:56:00 +0000
commita676024690e8b20327ff6886097f73b761ff4c0c (patch)
treede1f5467e077c995032a127185d284f37c41279b
parenteec3a2fdeff17dd79e5df962f7ca0d9d009802a9 (diff)
busybox-1.01: make ping6.c compile against glibc-2.4
-rw-r--r--packages/busybox/busybox_1.01.bb1
-rw-r--r--packages/busybox/files/glibc2.4-icmp6.patch15
2 files changed, 16 insertions, 0 deletions
diff --git a/packages/busybox/busybox_1.01.bb b/packages/busybox/busybox_1.01.bb
index 2ef3068f6e..cbef98d992 100644
--- a/packages/busybox/busybox_1.01.bb
+++ b/packages/busybox/busybox_1.01.bb
@@ -29,6 +29,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://udhcpscript.patch;patch=1 \
file://thumb-bsdlabel.patch;patch=1 \
file://uclibc_posix.patch;patch=1 \
+ file://glibc2.4-icmp6.patch;patch=1 \
file://defconfig \
file://busybox-cron \
file://busybox-httpd \
diff --git a/packages/busybox/files/glibc2.4-icmp6.patch b/packages/busybox/files/glibc2.4-icmp6.patch
new file mode 100644
index 0000000000..3cec1dd31a
--- /dev/null
+++ b/packages/busybox/files/glibc2.4-icmp6.patch
@@ -0,0 +1,15 @@
+--- busybox-1.01/networking/ping6.c.orig 2006-03-15 15:43:21.000000000 +0100
++++ busybox-1.01/networking/ping6.c 2006-03-15 15:49:29.000000000 +0100
+@@ -56,6 +56,12 @@
+ #include <stddef.h> /* offsetof */
+ #include "busybox.h"
+
++#ifndef ICMP6_MEMBERSHIP_QUERY /* glibc >= 2.4 */
++#define ICMP6_MEMBERSHIP_QUERY MLD_LISTENER_QUERY
++#define ICMP6_MEMBERSHIP_REPORT MLD_LISTENER_REPORT
++#define ICMP6_MEMBERSHIP_REDUCTION MLD_LISTENER_REDUCTION
++#endif
++
+ static const int DEFDATALEN = 56;
+ static const int MAXIPLEN = 60;
+ static const int MAXICMPLEN = 76;