mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Pass native: false to add_languages()

Browse source 
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: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/589>
This commit is contained in:
Nirbheek Chauhan 2020-05-12 04:35:37 +05:30
parent 553ac050f0
commit fbd4afc64c
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/qt/meson.build
View file

@ -33,7 +33,7 @@ if not have_gstgl
subdir_done() subdir_done()
endif endif
if not add_languages('cpp', required: qt5_option) if not add_languages('cpp', native: false, required: qt5_option)
subdir_done() subdir_done()
endif endif

2
ext/taglib/meson.build
View file

@ -6,7 +6,7 @@ taglib_sources = [
taglib_dep = dependency('taglib', version : '>= 1.5', required : get_option('taglib')) 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 = [] extra_args = []
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
if cxx.has_argument('-fvisibility=hidden') if cxx.has_argument('-fvisibility=hidden')

2
meson.build
View file

@ -16,7 +16,7 @@ else
endif endif
gst_version_is_dev = gst_version_minor % 2 == 1 and gst_version_micro < 90 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' glib_req = '>= 2.44.0'
orc_req = '>= 0.4.17' orc_req = '>= 0.4.17'

2
sys/osxvideo/meson.build
View file

@ -7,7 +7,7 @@ endif
osxvideo_opengl_dep = dependency('appleframeworks', modules : ['OpenGL'], required : get_option('osxvideo')) osxvideo_opengl_dep = dependency('appleframeworks', modules : ['OpenGL'], required : get_option('osxvideo'))
osxvideo_cocoa_dep = dependency('appleframeworks', modules : ['Cocoa'], 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() if have_objc and osxvideo_opengl_dep.found() and osxvideo_cocoa_dep.found()