libglib2-optional-ipv6.patch 1.3 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253
  1. [PATCH]: fix build on uClibc without IPv6 support
  2. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
  3. ---
  4. gio/ginetaddress.c | 9 +++++++++
  5. 1 file changed, 9 insertions(+)
  6. Index: glib-2.26.0/gio/ginetaddress.c
  7. ===================================================================
  8. --- glib-2.26.0.orig/gio/ginetaddress.c
  9. +++ glib-2.26.0/gio/ginetaddress.c
  10. @@ -21,6 +21,7 @@
  11. * Samuel Cormier-Iijima <sciyoshi@gmail.com>
  12. */
  13. +#include <features.h>
  14. #include <config.h>
  15. #include <string.h>
  16. @@ -434,7 +435,11 @@
  17. return NULL;
  18. }
  19. +#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__)
  20. +#define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET)
  21. +#else
  22. #define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET || (family) == AF_INET6)
  23. +#endif
  24. /**
  25. * g_inet_address_new_from_bytes:
  26. @@ -483,8 +488,10 @@
  27. return g_inet_address_new_from_bytes (addr, family);
  28. }
  29. +#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
  30. else
  31. return g_inet_address_new_from_bytes (in6addr_loopback.s6_addr, family);
  32. +#endif
  33. }
  34. /**
  35. @@ -510,8 +517,10 @@
  36. return g_inet_address_new_from_bytes (addr, family);
  37. }
  38. +#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
  39. else
  40. return g_inet_address_new_from_bytes (in6addr_any.s6_addr, family);
  41. +#endif
  42. }