[Mesa-dev] [PATCH] meson: Don't confuse the install and search paths for dri drivers

[Eric Anholt]

Dylan Baker <dylan at pnwbakers.com> writes:

> Currently there is not a separate option for setting the search path of
> DRI drivers in meson, like there is in scons and autotools. This is an
> oversight and needs to be fixed. This adds an extra option
> `dri-search-path`, which will default to the value of
> `dri-drivers-path`, like autotools does.
>
> Reported-by: Ilia Mirkin <imirkin at alum.mit.edu>
> Signed-off-by: Dylan Baker <dylan.c.baker at intel.com>
> ---
>  meson.build         | 6 ++++++
>  meson_options.txt   | 8 +++++++-
>  src/egl/meson.build | 2 +-
>  src/gbm/meson.build | 2 +-
>  src/glx/meson.build | 3 ++-
>  5 files changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index ae31cdd6571..8002668666b 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -57,6 +57,12 @@ dri_drivers_path = get_option('dri-drivers-path')
>  if dri_drivers_path == ''
>    dri_drivers_path = join_paths(get_option('libdir'), 'dri')
>  endif
> +_search = get_option('dri-search-path')
> +if _search != ''
> +  dri_search_path = ';'.join(_search)

If the user is passing a comma-separated string, don't you need to split
on the commas before joining?

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 832 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180117/0905bb91/attachment.sig>