kumquat-buildroot/package/libglib2/libglib2-optional-ipv6.patch
Lionel Landwerlin 862b4ca144 libglib2: bump to 2.22.4
[Peter: updated to 2.22.4 instead which is so far only on ftp.gnome.org,
 fixed build without IPv6 support]
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-01-28 17:07:11 +01:00

54 lines
1.4 KiB
Diff

[PATCH]: fix build on uClibc without IPv6 support
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
gio/ginetaddress.c | 9 +++++++++
1 file changed, 9 insertions(+)
Index: glib-2.22.4/gio/ginetaddress.c
===================================================================
--- glib-2.22.4.orig/gio/ginetaddress.c
+++ glib-2.22.4/gio/ginetaddress.c
@@ -21,6 +21,7 @@
* Samuel Cormier-Iijima <sciyoshi@gmail.com>
*/
+#include <features.h>
#include <config.h>
#include <string.h>
@@ -435,7 +436,11 @@ g_inet_address_new_from_string (const gc
return NULL;
}
+#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__)
+#define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET)
+#else
#define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET || (family) == AF_INET6)
+#endif
/**
* g_inet_address_new_from_bytes:
@@ -484,8 +489,10 @@ g_inet_address_new_loopback (GSocketFami
return g_inet_address_new_from_bytes (addr, family);
}
+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
else
return g_inet_address_new_from_bytes (in6addr_loopback.s6_addr, family);
+#endif
}
/**
@@ -511,8 +518,10 @@ g_inet_address_new_any (GSocketFamily fa
return g_inet_address_new_from_bytes (addr, family);
}
+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
else
return g_inet_address_new_from_bytes (in6addr_any.s6_addr, family);
+#endif
}