Merge branch 'test-ip_mreq_source-android-only' into 'master'
build: only test for broken ip_mreq_source on Android. Fixes #1472
Closes #1472
See merge request GNOME/glib!222
diff --git a/configure.ac b/configure.ac
index 11fde90..3fd519e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -922,20 +922,22 @@
AC_MSG_RESULT(no)
])
-AC_MSG_CHECKING([if ip_mreq_source.imr_interface has s_addr member])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
- [[
- #include <netinet/in.h>
- ]],
- [[
- struct ip_mreq_source mc_req_src;
- mc_req_src.imr_interface.s_addr = 0;
- ]])], [
- AC_MSG_RESULT(yes)
- ], [
- AC_MSG_RESULT(no)
- AC_DEFINE(BROKEN_IP_MREQ_SOURCE_STRUCT, 1, [struct ip_mreq_source definition is broken on Android NDK <= r16])
-])
+# See https://bugzilla.gnome.org/show_bug.cgi?id=740791
+AS_IF([test $glib_native_android = yes], [
+ AC_MSG_CHECKING([if ip_mreq_source.imr_interface has s_addr member])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+ [[
+ #include <netinet/in.h>
+ ]],
+ [[
+ struct ip_mreq_source mc_req_src;
+ mc_req_src.imr_interface.s_addr = 0;
+ ]])], [
+ AC_MSG_RESULT(yes)
+ ], [
+ AC_MSG_RESULT(no)
+ AC_DEFINE(BROKEN_IP_MREQ_SOURCE_STRUCT, 1, [struct ip_mreq_source definition is broken on Android NDK <= r16])
+ ])])
AS_IF([test $glib_native_win32 = yes], [
# <wspiapi.h> in the Windows SDK and in mingw-w64 has wrappers for
diff --git a/gio/meson.build b/gio/meson.build
index a6af822..4b2c8f2 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -152,6 +152,11 @@
glib_conf.set('HAVE_SIOCGIFADDR', '/**/')
endif
+endif
+
+if host_system.contains('android')
+ # struct ip_mreq_source definition is broken on Android NDK <= r16
+ # See https://bugzilla.gnome.org/show_bug.cgi?id=740791
if not cc.compiles('''#include <netinet/in.h>
int main(int argc, char ** argv) {
struct ip_mreq_source mc_req_src;
@@ -161,7 +166,6 @@
name : 'ip_mreq_source.imr_interface has s_addr member')
glib_conf.set('BROKEN_IP_MREQ_SOURCE_STRUCT', 1)
endif
-
endif
gnetworking_h_conf.set('WSPIAPI_INCLUDE', gnetworking_h_wspiapi_include)
