[glib] meson.build: make the android-check reflect the autotools one
- From: Nirbheek Chauhan <nirbheekc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] meson.build: make the android-check reflect the autotools one
- Date: Thu, 14 Dec 2017 10:52:08 +0000 (UTC)
commit 5f83cd3addc89db0619c3b83bab78a9c13ab4e43
Author: Havard Graff <havard graff gmail com>
Date: Mon Dec 11 14:48:18 2017 +1100
meson.build: make the android-check reflect the autotools one
In autotools this same check reads:
AS_IF([test $glib_native_android != yes]
with glib_native_android being defined as:
case $host in
*android*)
glib_native_android="yes"
;;
*)
glib_native_android="no"
;;
esac
This is needed to be able to compile on OSX.
https://bugzilla.gnome.org/show_bug.cgi?id=791460
Signed-off-by: Nirbheek Chauhan <nirbheek centricular com>
gio/meson.build | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/gio/meson.build b/gio/meson.build
index ddfd18f..b6ef138 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -18,10 +18,9 @@ if host_system == 'windows'
# inline workarounds for getaddrinfo, getnameinfo and freeaddrinfo if
# they aren't present at run-time (on Windows 2000).
gnetworking_h_wspiapi_include = '#include <wspiapi.h>'
-endif
-
-if host_system.contains('android')
- # Android does not have C_IN in public headers, we define it wherever necessary
+elif not host_system.contains('android')
+ # Don't check for C_IN on Android since it does not define it in public
+ # headers, we define it ourselves wherever necessary
if not cc.compiles('''#include <sys/types.h>
#include <arpa/nameser.h>
int qclass = C_IN;''',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]