luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'meson-devenv-gdb' into 'main'

Browse Source 
meson: Add PYTHONPATH to load GDB helper module

See merge request GNOME/glib!2528
This commit is contained in:
Philip Withnall 2022-03-01 11:24:21 +00:00
commit 46d1329f06
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glib/meson.build
View File

@ -452,6 +452,13 @@ configure_file(
install_data('glib_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb'))
# This is needed to make gdb find glib_gdb.py
if meson.version().version_compare('>=0.58')
env = environment()
env.prepend('PYTHONPATH', meson.current_source_dir())
meson.add_devenv(env)
endif
gdb_conf = configuration_data()
gdb_conf.set('datadir', glib_datadir)
# This is also used in gobject/meson.build

7
gobject/meson.build
View File

@ -170,6 +170,13 @@ configure_file(
install: gdb_install,
)
# This is needed to make gdb find gobject_gdb.py
if meson.version().version_compare('>=0.58')
env = environment()
env.prepend('PYTHONPATH', meson.current_source_dir())
meson.add_devenv(env)
endif
if enable_systemtap
gobject_stp = configure_file(input : 'gobject.stp.in',
output : '@0@.stp'.format(libgobject.full_path().split('/').get(-1)),