diff options
| author | Sergii Romantsov <sergii.romantsov@globallogic.com> | 2019-02-21 10:28:11 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-02-25 13:26:36 -0800 |
| commit | 697c6c5a19311a4a8a8653edeae4b0e1ae64ceba (patch) | |
| tree | ff44facdca7e2120470ad932321ddab346ef179b | |
| parent | edeb13b550b64866917f5b1fa3e3e63de285ccd9 (diff) | |
dri: meson: do not prefix user provided dri-drivers-path
The user can select the location where there dri drivers
are installed by the dri-drivers-path meson option.
By default path will be $prefix/$libdir/dri.
Currently we add $prefix to the user provided path.
Resulting in an incorrect or even missing path.
v2: fixed dri_search_path by default, rebased to master
v3: new commit-message (Emil Velikov), cc mesa-stable
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109698
CC: Rafael Antognolli <rafael.antognolli@intel.com>
CC: Dylan Baker <dylan@pnwbakers.com>
Cc: 18.3 19.0 <mesa-stable@lists.freedesktop.org>
Fixes: 306914db92e1 (meson: Add dridriverdir variable to dri.pc.)
Signed-off-by: Sergii Romantsov <sergii.romantsov@globallogic.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
(cherry picked from commit f6556ec7d126b31da37c08d7cb657250505e01a0)
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/meson.build | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meson.build b/meson.build index bfff862c3c8..9272590201d 100644 --- a/meson.build +++ b/meson.build @@ -61,11 +61,11 @@ endif dri_drivers_path = get_option('dri-drivers-path') if dri_drivers_path == '' - dri_drivers_path = join_paths(get_option('libdir'), 'dri') + dri_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'dri') endif dri_search_path = get_option('dri-search-path') if dri_search_path == '' - dri_search_path = join_paths(get_option('prefix'), dri_drivers_path) + dri_search_path = dri_drivers_path endif with_gles1 = get_option('gles1') diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build index d98c823f5fe..0410a5a12ec 100644 --- a/src/mesa/drivers/dri/meson.build +++ b/src/mesa/drivers/dri/meson.build @@ -78,7 +78,7 @@ if with_dri filebase : 'dri', description : 'Direct Rendering Infrastructure', version : meson.project_version(), - variables : ['dridriverdir=${prefix}/' + dri_drivers_path], + variables : ['dridriverdir=' + dri_drivers_path], requires_private : dri_req_private, ) endif |