From 1f09d08a4f19dcd5661e0abc2cb5ed424c954cac Mon Sep 17 00:00:00 2001 From: Sergii Romantsov Date: Fri, 22 Feb 2019 11:23:08 +0200 Subject: [PATCH] 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 CC: Emil Velikov Signed-off-by: Sergii Romantsov Reviewed-by: Emil Velikov (cherry picked from commit dcc48664197c7e44684ccfb970a4ae083974d145) Fixes: b7c6870f87a ("meson: Add moduledir to d3d.pc") --- meson.build | 2 +- src/gallium/targets/d3dadapter9/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 80f8868076e..64bd109003d 100644 --- a/meson.build +++ b/meson.build @@ -615,7 +615,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 bc72b1110a0..b3c31c5dc6d 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)], )