kumquat-buildroot/package/libglib2/libglib2-optional-ipv6.patch

54 lines
1.3 KiB
Diff
Raw Normal View History

[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.26.0/gio/ginetaddress.c
===================================================================
--- glib-2.26.0.orig/gio/ginetaddress.c
+++ glib-2.26.0/gio/ginetaddress.c
@@ -21,6 +21,7 @@
* Samuel Cormier-Iijima <sciyoshi@gmail.com>
*/
+#include <features.h>
#include <config.h>
#include <string.h>
@@ -434,7 +435,11 @@
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:
@@ -483,8 +488,10 @@
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
}
/**
@@ -510,8 +517,10 @@
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
}