[vala/wip/meson: 7/11] Pass LD_LIBRARY_PATH as "env" where needed




commit 978806440b204f7fb15fe30abb1d8845a162d373
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Sun Feb 7 22:03:21 2021 +0100

    Pass LD_LIBRARY_PATH as "env" where needed

 doc/meson.build           | 3 +++
 tests/meson.build         | 1 +
 valadoc/tests/meson.build | 6 ++++++
 3 files changed, 10 insertions(+)
---
diff --git a/doc/meson.build b/doc/meson.build
index 40519581d..c5763e518 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -17,6 +17,7 @@ if help2man.found() and get_option('manpages')
                        '--include', join_paths(meson.current_source_dir(), 'valac.h2m'),
                        '--no-info', '--output=@OUTPUT@', valac_exe
                ],
+               env: 'LD_LIBRARY_PATH=' + join_paths(meson.build_root(), 'vala') + ':' + 
join_paths(meson.build_root(), 'codegen'),
                install: true,
                install_dir: man_1_dir,
        )
@@ -26,6 +27,7 @@ if help2man.found() and get_option('manpages')
                        '--include', join_paths(meson.current_source_dir(), 'vapigen.h2m'),
                        '--no-info', '--output=@OUTPUT@', vapigen_exe
                ],
+               env: 'LD_LIBRARY_PATH=' + join_paths(meson.build_root(), 'vala') + ':' + 
join_paths(meson.build_root(), 'codegen'),
                install: true,
                install_dir: man_1_dir,
        )
@@ -36,6 +38,7 @@ if help2man.found() and get_option('manpages')
                                '--include', join_paths(meson.current_source_dir(), 'valadoc.h2m'),
                                '--no-info', '--output=@OUTPUT@', valadoc_exe
                        ],
+                       env: 'LD_LIBRARY_PATH=' + join_paths(meson.build_root(), 'vala') + ':' + 
join_paths(meson.build_root(), 'codegen') + ':' + join_paths(meson.build_root(), 'libvaladoc'),
                        install: true,
                        install_dir: man_1_dir,
                )
diff --git a/tests/meson.build b/tests/meson.build
index d7c653237..2c6e2a1f0 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1396,6 +1396,7 @@ vala_flags = [
 
 test_envars = [
        'G_DEBUG=fatal-warnings',
+       'LD_LIBRARY_PATH=' + join_paths(meson.build_root(), 'vala') + ':' + join_paths(meson.build_root(), 
'codegen'),
 ]
 
 foreach flag : supported_test_cflags
diff --git a/valadoc/tests/meson.build b/valadoc/tests/meson.build
index 10ac347c5..80026e843 100644
--- a/valadoc/tests/meson.build
+++ b/valadoc/tests/meson.build
@@ -37,6 +37,11 @@ vala_flags = [
        join_paths(meson.source_root(), 'valadoc', 'tests', 'libvaladoc', 'parser-generic-scanner.vala'),
 ]
 
+test_envars = [
+       'G_DEBUG=fatal-warnings',
+       'LD_LIBRARY_PATH=' + join_paths(meson.build_root(), 'vala') + ':' + join_paths(meson.build_root(), 
'codegen') + ':' + join_paths(meson.build_root(), 'libvaladoc'),
+]
+
 foreach flag : supported_test_cflags
        vala_flags += ['-X', flag]
 endforeach
@@ -47,6 +52,7 @@ foreach case : test_cases
                valac_exe,
                workdir: meson.current_build_dir(),
                args: vala_flags + [join_paths(meson.current_source_dir(), case)],
+               env: test_envars,
                depends: [valacore_lib, libvaladoc_lib],
                suite: suite[0],
        )


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]