meson: host_machine.system() is darwin even on iOS

Also use host_system everywhere.

diff --git a/libs/gst/check/meson.build b/libs/gst/check/meson.build
index 13109f8..00ea454 100644 (file)
--- a/libs/gst/check/meson.build
+++ b/libs/gst/check/meson.build
@@ -23,7 +23,7 @@ check_cdata.set('ENABLE_SUBUNIT', 0)
 check_cdata.set('CHECK_MAJOR_VERSION', 0)
 check_cdata.set('CHECK_MINOR_VERSION', 9)
 check_cdata.set('CHECK_MICRO_VERSION', 14)
-if host_machine.system() != 'windows'
+if host_system != 'windows'
   check_cdata.set('HAVE_FORK', 1)
 else
   check_cdata.set('HAVE_FORK', 0)

diff --git a/libs/gst/helpers/meson.build b/libs/gst/helpers/meson.build
index 3a3a1b8..71adc21 100644 (file)
--- a/libs/gst/helpers/meson.build
+++ b/libs/gst/helpers/meson.build
@@ -23,20 +23,18 @@ endif
 
 # Check PTP support
 have_ptp = false
-if host_machine.system() == 'android'
+if host_system == 'android'
   message('PTP not supported on Android because of permissions.')
-elif host_machine.system() == 'windows'
+elif host_system == 'windows'
   message('PTP not supported on Windows, not ported yet.')
-elif host_machine.system() == 'ios' # FIXME: is it also darwing on iOS ?
-  message('PTP not supported on iOS because of permissions.')
-elif host_machine.system() == 'darwin'
+elif host_system == 'darwin'
   if cc.has_header('MobileCoreServices/MobileCoreServices.h')
     message('PTP not supported on iOS because of permissions.')
   else
     have_ptp = true
   endif
-elif ['linux', 'netbsd', 'freebsd', 'openbsd', 'kfreebsd', 'dragonfly', 'solaris'].contains(host_machine.system())
-  message('PTP supported on ' + host_machine.system() + '.')
+elif ['linux', 'netbsd', 'freebsd', 'openbsd', 'kfreebsd', 'dragonfly', 'solaris'].contains(host_system)
+  message('PTP supported on ' + host_system + '.')
   have_ptp = true
 endif
 

diff --git a/meson.build b/meson.build
index 51aba77..07d82ec 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -156,7 +156,7 @@ check_headers = [
   'sys/resource.h',
 ]
 
-if host_machine.system() == 'windows'
+if host_system == 'windows'
   check_headers += ['winsock2.h']
 endif
 
@@ -269,7 +269,7 @@ if cc.has_function('strdup')
 elif host_system == 'windows' and cc.has_function('_strdup')
   cdata.set('HAVE__STRDUP', 1) # Windows (MSVC)
 endif
-if host_machine.system() != 'windows'
+if host_system != 'windows'
   cdata.set('HAVE_FORK', 1)
 else
   # libcheck requires HAVE_FORK to be 0 when fork() is not available
@@ -296,7 +296,7 @@ endif
 
 # Platform deps; only ws2_32 and execinfo for now
 platform_deps = []
-if host_machine.system() == 'windows'
+if host_system == 'windows'
   platform_deps = [cc.find_library('ws2_32')]
 endif
 
@@ -389,7 +389,7 @@ gobject_dep = dependency('gobject-2.0',
   fallback: ['glib', 'libgobject_dep'])
 gmodule_dep = dependency('gmodule-2.0',
   fallback: ['glib', 'libgmodule_dep'])
-if host_machine.system() == 'windows'
+if host_system == 'windows'
     gio_dep = dependency('gio-2.0',
         fallback: ['glib', 'libgio_dep'])
 else