From ad8ea38e0ae513b16bd24d4c5b5f40c5133906e1 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Wed, 21 Feb 2024 08:29:45 +0530 Subject: [PATCH] meson: Use host_system for the host_machine system This is a convention everywhere else in gstreamer. Part-of: --- subprojects/gst-editing-services/docs/meson.build | 2 +- subprojects/gst-editing-services/meson.build | 9 +++++---- subprojects/gst-editing-services/tests/meson.build | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/subprojects/gst-editing-services/docs/meson.build b/subprojects/gst-editing-services/docs/meson.build index e346c2fc9f..ee02280829 100644 --- a/subprojects/gst-editing-services/docs/meson.build +++ b/subprojects/gst-editing-services/docs/meson.build @@ -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 = ':' diff --git a/subprojects/gst-editing-services/meson.build b/subprojects/gst-editing-services/meson.build index 56c5e0d5de..13af8ec3e8 100644 --- a/subprojects/gst-editing-services/meson.build +++ b/subprojects/gst-editing-services/meson.build @@ -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 diff --git a/subprojects/gst-editing-services/tests/meson.build b/subprojects/gst-editing-services/tests/meson.build index 7a31607833..7dea3eb0ee 100644 --- a/subprojects/gst-editing-services/tests/meson.build +++ b/subprojects/gst-editing-services/tests/meson.build @@ -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