diff options
| author | Sergii Romantsov <sergii.romantsov@globallogic.com> | 2019-02-22 11:23:08 +0200 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2019-02-25 16:07:02 +0000 |
| commit | dcc48664197c7e44684ccfb970a4ae083974d145 (patch) | |
| tree | 1e29935275b645686647714ea8bd141a556c2033 | |
| parent | f6556ec7d126b31da37c08d7cb657250505e01a0 (diff) | |
d3d: meson: do not prefix user provided d3d-drivers-path
The user can select the location where there d3d drivers
are installed by the d3d-drivers-path meson option.
By default path will be $prefix/$libdir/d3d.
Currently we add $prefix to the user provided path.
Resulting in an incorrect or even missing path.
Based on logic of
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109698
CC: Kenneth Graunke <kenneth@whitecape.org>
CC: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Sergii Romantsov <sergii.romantsov@globallogic.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/gallium/targets/d3dadapter9/meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 8cac9f676dd1..50d2eec97efe 100644 --- a/meson.build +++ b/meson.build @@ -610,7 +610,7 @@ with_gallium_xa = _xa != 'false' d3d_drivers_path = get_option('d3d-drivers-path') if d3d_drivers_path == '' - d3d_drivers_path = join_paths(get_option('libdir'), 'd3d') + d3d_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'd3d') endif with_gallium_st_nine = get_option('gallium-nine') diff --git a/src/gallium/targets/d3dadapter9/meson.build b/src/gallium/targets/d3dadapter9/meson.build index db8c6b0a6921..8cccdfe1af81 100644 --- a/src/gallium/targets/d3dadapter9/meson.build +++ b/src/gallium/targets/d3dadapter9/meson.build @@ -68,5 +68,5 @@ pkg.generate( description : 'Native D3D driver modules', version : '.'.join(nine_version), requires_private : 'libdrm >= ' + dep_libdrm.version(), - variables : ['moduledir=${prefix}/@0@'.format(d3d_drivers_path)], + variables : ['moduledir=@0@'.format(d3d_drivers_path)], ) |