From fbd4afc64c50961bcd9ba354b978099f4092c396 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Tue, 12 May 2020 04:35:37 +0530 Subject: [PATCH] meson: Pass native: false to add_languages() This is needed for cross-compiling without a build machine compiler available. The option was added in 0.54, but we only need this in Cerbero and it doesn't break older versions so it should be ok. Part-of: --- ext/qt/meson.build | 2 +- ext/taglib/meson.build | 2 +- meson.build | 2 +- sys/osxvideo/meson.build | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/qt/meson.build b/ext/qt/meson.build index 0715ca416d..c86e86a55b 100644 --- a/ext/qt/meson.build +++ b/ext/qt/meson.build @@ -33,7 +33,7 @@ if not have_gstgl subdir_done() endif -if not add_languages('cpp', required: qt5_option) +if not add_languages('cpp', native: false, required: qt5_option) subdir_done() endif diff --git a/ext/taglib/meson.build b/ext/taglib/meson.build index d526682a3e..dcea2c58e8 100644 --- a/ext/taglib/meson.build +++ b/ext/taglib/meson.build @@ -6,7 +6,7 @@ taglib_sources = [ taglib_dep = dependency('taglib', version : '>= 1.5', required : get_option('taglib')) -if taglib_dep.found() and add_languages('cpp', required : get_option('taglib')) +if taglib_dep.found() and add_languages('cpp', native: false, required: get_option('taglib')) extra_args = [] cxx = meson.get_compiler('cpp') if cxx.has_argument('-fvisibility=hidden') diff --git a/meson.build b/meson.build index c501ccdf6b..7461fd9c4e 100644 --- a/meson.build +++ b/meson.build @@ -16,7 +16,7 @@ else endif gst_version_is_dev = gst_version_minor % 2 == 1 and gst_version_micro < 90 -have_cxx = add_languages('cpp', required : false) +have_cxx = add_languages('cpp', native: false, required: false) glib_req = '>= 2.44.0' orc_req = '>= 0.4.17' diff --git a/sys/osxvideo/meson.build b/sys/osxvideo/meson.build index 28ff76724f..4a96fdc282 100644 --- a/sys/osxvideo/meson.build +++ b/sys/osxvideo/meson.build @@ -7,7 +7,7 @@ endif osxvideo_opengl_dep = dependency('appleframeworks', modules : ['OpenGL'], required : get_option('osxvideo')) osxvideo_cocoa_dep = dependency('appleframeworks', modules : ['Cocoa'], required : get_option('osxvideo')) -have_objc = add_languages('objc', required : get_option('osxvideo')) +have_objc = add_languages('objc', native: false, required: get_option('osxvideo')) if have_objc and osxvideo_opengl_dep.found() and osxvideo_cocoa_dep.found()