Use gmodule-no-export-2.0

We don't need `-Wl,--export-dynamic`, that's used only for executables
that needs to export an API to be used by plugins they load.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2031>
This commit is contained in:
Xavier Claessens 2022-03-30 11:06:02 -04:00 committed by GStreamer Marge Bot
parent b004464ac6
commit a40634eebe
10 changed files with 10 additions and 10 deletions

View file

@ -88,7 +88,7 @@ gst_check_dep = dependency('gstreamer-check-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_check_dep']) fallback : ['gstreamer', 'gst_check_dep'])
gio_dep = dependency('gio-2.0', version: glib_req) gio_dep = dependency('gio-2.0', version: glib_req)
gmodule_dep = dependency('gmodule-2.0') gmodule_dep = dependency('gmodule-no-export-2.0')
gtk_dep = dependency('gtk+-3.0', required: false) gtk_dep = dependency('gtk+-3.0', required: false)
mathlib = cc.find_library('m', required : false) mathlib = cc.find_library('m', required : false)

View file

@ -116,7 +116,7 @@ gstvalidate_dep = dependency('gst-validate-1.0', version : gst_req, required : g
fallback : ['gst-devtools', 'validate_dep']) fallback : ['gst-devtools', 'validate_dep'])
gio_dep = dependency('gio-2.0', version: glib_req) gio_dep = dependency('gio-2.0', version: glib_req)
gmodule_dep = dependency('gmodule-2.0') gmodule_dep = dependency('gmodule-no-export-2.0')
libxml_dep = dependency('libxml-2.0', required: get_option('xptv')) libxml_dep = dependency('libxml-2.0', required: get_option('xptv'))
cdata.set('DISABLE_XPTV', not libxml_dep.found()) cdata.set('DISABLE_XPTV', not libxml_dep.found())

View file

@ -163,7 +163,7 @@ gstcheck_dep = dependency('gstreamer-check-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_check_dep']) fallback : ['gstreamer', 'gst_check_dep'])
libm = cc.find_library('m', required : false) libm = cc.find_library('m', required : false)
gmodule_dep = dependency('gmodule-2.0', version: glib_req) gmodule_dep = dependency('gmodule-no-export-2.0', version: glib_req)
gst_omx_args = ['-DHAVE_CONFIG_H'] gst_omx_args = ['-DHAVE_CONFIG_H']
configinc = include_directories('.') configinc = include_directories('.')

View file

@ -382,7 +382,7 @@ endif
libm = cc.find_library('m', required : false) libm = cc.find_library('m', required : false)
gio_dep = dependency('gio-2.0', version: glib_req) gio_dep = dependency('gio-2.0', version: glib_req)
gmodule_dep = dependency('gmodule-2.0') gmodule_dep = dependency('gmodule-no-export-2.0')
# gio-unix-2.0 is used by sys/bluez # gio-unix-2.0 is used by sys/bluez
# Optional dep of ext/gl and gst/librfb # Optional dep of ext/gl and gst/librfb

View file

@ -315,7 +315,7 @@ giounix_dep = dependency('', required: false)
if host_system != 'windows' if host_system != 'windows'
giounix_dep = dependency('gio-unix-2.0') giounix_dep = dependency('gio-unix-2.0')
endif endif
gmodule_dep = dependency('gmodule-2.0') gmodule_dep = dependency('gmodule-no-export-2.0')
# some of the examples can use gdk-pixbuf and GTK+3 # some of the examples can use gdk-pixbuf and GTK+3
gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', required : get_option('examples')) gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', required : get_option('examples'))

View file

@ -370,7 +370,7 @@ endif
cdata.set('HAVE_ZLIB', true) cdata.set('HAVE_ZLIB', true)
gio_dep = dependency('gio-2.0', version: glib_req) gio_dep = dependency('gio-2.0', version: glib_req)
gmodule_dep = dependency('gmodule-2.0') gmodule_dep = dependency('gmodule-no-export-2.0')
gst_plugins_good_args = ['-DHAVE_CONFIG_H'] gst_plugins_good_args = ['-DHAVE_CONFIG_H']
configinc = include_directories('.') configinc = include_directories('.')

View file

@ -187,7 +187,7 @@ else
cdata.set('DISABLE_ORC', 1) cdata.set('DISABLE_ORC', 1)
endif endif
gmodule_dep = dependency('gmodule-2.0', version: glib_req) gmodule_dep = dependency('gmodule-no-export-2.0', version: glib_req)
if gmodule_dep.version().version_compare('< 2.67.4') if gmodule_dep.version().version_compare('< 2.67.4')
cdata.set('g_memdup2(ptr,sz)', '(G_LIKELY(((guint64)(sz)) < G_MAXUINT)) ? g_memdup(ptr,sz) : (g_abort(),NULL)') cdata.set('g_memdup2(ptr,sz)', '(G_LIKELY(((guint64)(sz)) < G_MAXUINT)) ? g_memdup(ptr,sz) : (g_abort(),NULL)')

View file

@ -19,7 +19,7 @@ gst_dep = dependency('gstreamer-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_dep']) fallback : ['gstreamer', 'gst_dep'])
gstbase_dep = dependency('gstreamer-base-1.0', version : gst_req, gstbase_dep = dependency('gstreamer-base-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_base_dep']) fallback : ['gstreamer', 'gst_base_dep'])
gmodule_dep = dependency('gmodule-2.0') gmodule_dep = dependency('gmodule-no-export-2.0')
pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_dep'], version : '>= 3.8') pygobject_dep = dependency('pygobject-3.0', fallback: ['pygobject', 'pygobject_dep'], version : '>= 3.8')
pymod = import('python') pymod = import('python')

View file

@ -94,7 +94,7 @@ libudev_dep = dependency('libudev', required: get_option('drm'))
x11_dep = dependency('x11', required: get_option('x11')) x11_dep = dependency('x11', required: get_option('x11'))
xrandr_dep = dependency('xrandr', required: get_option('x11')) xrandr_dep = dependency('xrandr', required: get_option('x11'))
gmodule_dep = dependency('gmodule-2.0') gmodule_dep = dependency('gmodule-no-export-2.0')
egl_dep = dependency('egl', required: get_option('egl')) egl_dep = dependency('egl', required: get_option('egl'))
glesv2_dep = dependency('glesv2', required: false) glesv2_dep = dependency('glesv2', required: false)

View file

@ -525,7 +525,7 @@ privinc = include_directories('gst')
glib_dep = dependency('glib-2.0', version : '>=2.56.0', glib_dep = dependency('glib-2.0', version : '>=2.56.0',
fallback: ['glib', 'libglib_dep']) fallback: ['glib', 'libglib_dep'])
gobject_dep = dependency('gobject-2.0') gobject_dep = dependency('gobject-2.0')
gmodule_dep = dependency('gmodule-2.0') gmodule_dep = dependency('gmodule-no-export-2.0')
if host_system == 'windows' if host_system == 'windows'
gio_dep = dependency('gio-2.0') gio_dep = dependency('gio-2.0')
else else