luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'revert3356' into 'main'

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

See merge request GNOME/glib!3504
This commit is contained in:
Michael Catanzaro 2023-07-20 15:20:58 +00:00
commit a552bf5694
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/tests/meson.build
View File

@ -774,7 +774,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],
c_args : export_dynamic_cflags, link_args : export_dynamic_ldflags,
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,24 +115,22 @@ pkg.generate(libgmodule,
description : 'Dynamic module loader for GLib', description : 'Dynamic module loader for GLib',
) )
pkg.generate(libraries : [libgmodule], pkg.generate(libraries : [libgmodule, export_dynamic_ldflags],
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], pkg.generate(libraries : [libgmodule, export_dynamic_ldflags],
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

@ -2334,15 +2334,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_cflags = [] export_dynamic_ldflags = []
elif host_system == 'cygwin' elif host_system == 'cygwin'
export_dynamic_cflags = ['-Wl,--export-all-symbols'] export_dynamic_ldflags = ['-Wl,--export-all-symbols']
elif host_system in ['darwin', 'ios'] elif host_system in ['darwin', 'ios']
export_dynamic_cflags = [] export_dynamic_ldflags = []
elif host_system == 'sunos' elif host_system == 'sunos'
export_dynamic_cflags = [] export_dynamic_ldflags = []
else else
export_dynamic_cflags = ['-Wl,--export-dynamic'] export_dynamic_ldflags = ['-Wl,--export-dynamic']
endif endif
win32_cflags = [] win32_cflags = []