meson: Use host_system for the host_machine system
authorNirbheek Chauhan <nirbheek@centricular.com>
Wed, 21 Feb 2024 02:59:45 +0000 (08:29 +0530)
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>
Wed, 21 Feb 2024 21:47:12 +0000 (21:47 +0000)
This is a convention everywhere else in gstreamer.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6159>

subprojects/gst-editing-services/docs/meson.build
subprojects/gst-editing-services/meson.build
subprojects/gst-editing-services/tests/meson.build

index e346c2fc9f710fdd051d6032cb77364e8096d235..ee02280829fe612f57ab723e90d12d7818be32bb 100644 (file)
@@ -111,7 +111,7 @@ libs_doc = [hotdoc.generate_doc('gst-editing-services',
     depends: ges_gir[0],
 )]
 
-if host_machine.system() == 'windows'
+if host_system == 'windows'
   pathsep = ';'
 else
   pathsep = ':'
index 56c5e0d5de842e8d0877c6313aacfca7b4a0b5b8..13af8ec3e819f8062691b8895a23d980bcf41cad 100644 (file)
@@ -35,6 +35,7 @@ else
   gst_req = '>= ' + gst_version
 endif
 
+host_system = host_machine.system()
 cc = meson.get_compiler('c')
 mathlib = cc.find_library('m', required : false)
 
@@ -101,7 +102,7 @@ gstaudio_dep = dependency('gstreamer-audio-' + apiversion, version : gst_req,
     fallback : ['gst-plugins-base', 'audio_dep'])
 gstbase_dep = dependency('gstreamer-base-1.0', version : gst_req,
     fallback : ['gstreamer', 'gst_base_dep'])
-if host_machine.system() != 'windows'
+if host_system != 'windows'
   gstcheck_dep = dependency('gstreamer-check-1.0', version : gst_req,
     required : get_option('tests'),
     fallback : ['gstreamer', 'gst_check_dep'])
@@ -175,7 +176,7 @@ elif build_gir
     elif pylib_loc == ''
       fsmod = import('fs')
       pylib_loc = python.get_variable('LIBPL', '')
-      if host_machine.system() != 'windows' and host_machine.system() != 'darwin'
+      if host_system != 'windows' and host_system != 'darwin'
         pylib_ldlibrary = python.get_variable('LDLIBRARY', '')
         if not fsmod.exists(pylib_loc / pylib_ldlibrary)
           # Workaround for Fedora
@@ -189,9 +190,9 @@ elif build_gir
       endif
       if error_msg == ''
         pylib_suffix = 'so'
-        if host_machine.system() == 'windows'
+        if host_system == 'windows'
           pylib_suffix = 'dll'
-        elif host_machine.system() == 'darwin'
+        elif host_system == 'darwin'
           pylib_suffix = 'dylib'
         endif
 
index 7a316078336b581d35652c46bb2969d95c45f60d..7dea3eb0ee336c2fbd391d7ed0f332eb4fa02252 100644 (file)
@@ -3,7 +3,7 @@ if get_option('tests').disabled() or static_build
 endif
 
 # FIXME: make check work on windows
-if host_machine.system() != 'windows' and gstcheck_dep.found()
+if host_system != 'windows' and gstcheck_dep.found()
   subdir('check')
 endif