diff options
| author | Petri Latvala <petri.latvala@intel.com> | 2018-01-19 13:44:07 +0200 |
|---|---|---|
| committer | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2018-03-12 14:08:26 +0200 |
| commit | add8216df607db8152a38773b201dcb7e6656086 (patch) | |
| tree | 94e3f7f22fba053158d2db3e9a09d2202e280140 /tests/meson.build | |
| parent | ffba1cec3cb4a4bf53bba1e333e3ac94c52ce8a2 (diff) | |
meson: Set up runpath for installed executables
Meson builds libigt as a shared library, and executables naturally
have to find it at runtime. Using default options puts the library to
a normal search paths, but any modifications to the directory options
or a non-conventional prefix setting makes using LD_LIBRARY_PATH or
other library search means mandatory.
Add a build option 'use_rpath' (default: false) that makes meson set
up DT_RUNPATH at install time, pointing to the library with a path
relative to the executable, using $ORIGIN. That way the installed
executables find the library even when not installed to exactly the
build-time configured prefix path, a setup CI occasionally uses.
Signed-off-by: Petri Latvala <petri.latvala@intel.com>
Cc: Tomi Sarvela <tomi.p.sarvela@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Tested-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Diffstat (limited to 'tests/meson.build')
| -rw-r--r-- | tests/meson.build | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/tests/meson.build b/tests/meson.build index 6e776bb7..689e2911 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -255,24 +255,49 @@ if alsa.found() and gsl.found() test_deps += alsa endif +if get_option('use_rpath') + # Set up runpath for the test executables towards libigt.so. + # The path should be relative to $ORIGIN so the library is + # still found properly even if installed to a path other than + # prefix. + + # libdir and libexecdir are pathnames relative to + # prefix. meson enforces this. + + # Start from the executable + rpathdir = '$ORIGIN' + # Executables are installed in libexecdir. Add a .. for each + # directory name in it. + foreach p : libexecdir.split('/') + rpathdir = join_paths(rpathdir, '..') + endforeach + # Add relative path to libdir + rpathdir = join_paths(rpathdir, libdir) +else + rpathdir = '' +endif + test_executables = [] foreach prog : test_progs test_executables += executable(prog, prog + '.c', dependencies : test_deps, install_dir : libexecdir, + install_rpath : rpathdir, install : true) endforeach test_executables += executable('perf_pmu', 'perf_pmu.c', dependencies : test_deps + [ lib_igt_perf ], install_dir : libexecdir, + install_rpath : rpathdir, install : true) test_progs += 'perf_pmu' executable('testdisplay', ['testdisplay.c', 'testdisplay_hotplug.c'], dependencies : test_deps, install_dir : libexecdir, + install_rpath : rpathdir, install : true) test_progs += 'testdisplay' @@ -292,6 +317,7 @@ endforeach executable('gem_stress', 'gem_stress.c', install : true, install_dir : libexecdir, + install_rpath : rpathdir, dependencies : igt_deps) # IMPORTANT: These tests here are all disabled because the result in sometime |