luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-20 07:38:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/jtojnar/wl-are-compiler-flags' into 'main'

Browse Source 
build/gmodule-2.0.pc: Move compiler flags from Libs to Cflags

See merge request GNOME/glib!3356
This commit is contained in:
Philip Withnall
2023-04-14 15:52:56 +00:00
parent d5a7982eeb 004f48f4fc
commit 11bdd6fcc4
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gio/tests/meson.build
View File

@@ -767,7 +767,7 @@ if not meson.is_cross_build()
resource_plugin += shared_module('resourceplugin', resource_plugin += shared_module('resourceplugin',
sources: ['resourceplugin.c', plugin_resources_c], sources: ['resourceplugin.c', plugin_resources_c],
link_args : export_dynamic_ldflags, c_args : export_dynamic_cflags,
dependencies : common_gio_tests_deps, dependencies : common_gio_tests_deps,
install_dir : installed_tests_execdir, install_dir : installed_tests_execdir,
install_tag : 'tests', install_tag : 'tests',

6
gmodule/meson.build
View File

@@ -115,22 +115,24 @@ pkg.generate(libgmodule,
description : 'Dynamic module loader for GLib', description : 'Dynamic module loader for GLib',
) )
pkg.generate(libraries : [libgmodule, export_dynamic_ldflags], pkg.generate(libraries : [libgmodule],
requires : ['glib-2.0'], requires : ['glib-2.0'],
version : glib_version, version : glib_version,
variables : [supported_var], variables : [supported_var],
install_dir : glib_pkgconfigreldir, install_dir : glib_pkgconfigreldir,
filebase : 'gmodule-export-2.0', filebase : 'gmodule-export-2.0',
extra_cflags : export_dynamic_cflags,
name : 'GModule', name : 'GModule',
description : 'Dynamic module loader for GLib', description : 'Dynamic module loader for GLib',
) )
pkg.generate(libraries : [libgmodule, export_dynamic_ldflags], pkg.generate(libraries : [libgmodule],
requires : ['glib-2.0'], requires : ['glib-2.0'],
version : glib_version, version : glib_version,
variables : [supported_var], variables : [supported_var],
install_dir : glib_pkgconfigreldir, install_dir : glib_pkgconfigreldir,
filebase : 'gmodule-2.0', filebase : 'gmodule-2.0',
extra_cflags : export_dynamic_cflags,
name : 'GModule', name : 'GModule',
description : 'Dynamic module loader for GLib', description : 'Dynamic module loader for GLib',
) )

10
meson.build
View File

@@ -2305,15 +2305,15 @@ if host_system == 'windows'
# Autotools explicitly removed --Wl,--export-all-symbols from windows builds, # Autotools explicitly removed --Wl,--export-all-symbols from windows builds,
# with no explanation. Do the same here for now but this could be revisited if # with no explanation. Do the same here for now but this could be revisited if
# if causes issues. # if causes issues.
export_dynamic_ldflags = [] export_dynamic_cflags = []
elif host_system == 'cygwin' elif host_system == 'cygwin'
export_dynamic_ldflags = ['-Wl,--export-all-symbols'] export_dynamic_cflags = ['-Wl,--export-all-symbols']
elif host_system in ['darwin', 'ios'] elif host_system in ['darwin', 'ios']
export_dynamic_ldflags = [] export_dynamic_cflags = []
elif host_system == 'sunos' elif host_system == 'sunos'
export_dynamic_ldflags = [] export_dynamic_cflags = []
else else
export_dynamic_ldflags = ['-Wl,--export-dynamic'] export_dynamic_cflags = ['-Wl,--export-dynamic']
endif endif
win32_cflags = [] win32_cflags = []