Quoting Jon Turney (2018-01-24 10:29:03)
> On 24/01/2018 18:19, Dylan Baker wrote:
> > Quoting Emil Velikov (2018-01-24 03:53:35)
> >> On 24 January 2018 at 10:39, Marc Dietrich <marvi...@gmx.de> wrote:
> >>> Hi Dylan,
> >>>
> >>> Am Dienstag, 23. Januar 2018, 19:28:08 CET schrieb Dylan Baker:
> >>>> Fixes: d1992255bb29 ("meson: Add build Intel "anv" vulkan driver")
> >>>> Reported-by: Marc Dietrich <marvi...@gmx.de>
> >>>> Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com>
> >>>> ---
> >>>> src/util/meson.build | 8 ++++++--
> >>>> 1 file changed, 6 insertions(+), 2 deletions(-)
> >>>>
> >>>> diff --git a/src/util/meson.build b/src/util/meson.build
> >>>> index fa591c92e56..b23dba3a985 100644
> >>>> --- a/src/util/meson.build
> >>>> +++ b/src/util/meson.build
> >>>> @@ -112,8 +112,12 @@ libxmlconfig = static_library(
> >>>> files_xmlconfig,
> >>>> include_directories : inc_common,
> >>>> dependencies : [dep_expat, dep_m],
> >>>> - c_args : [c_msvc_compat_args, c_vis_args,
> >>>> - '-DSYSCONFDIR="@0@"'.format(get_option('sysconfdir'))],
> >>>> + c_args : [
> >>>> + c_msvc_compat_args, c_vis_args,
> >>>> + '-DSYSCONFDIR="@0@"'.format(
> >>>> + join_paths(get_option('prefix'), get_option('sysconfdir'))
> >>>> + ),
> >>>> + ],
> >>>> build_by_default : false,
> >>>> )
> >>>
> >>> this won't work as the prefix is often set to /usr, which results in
> >>> sysconfdir to be /usr/etc. As this is a special case, and "/etc" is the
>
> No. from the meson documentation on join_paths(): "If any one of the
> individual segments is an absolute path, all segments before it are
> dropped."
>
> So I think this is right as written.
> Oh, nice! I missed that in the docs, so this is definately the right thing to do, although I think we need to fix the drirc install path as well. Dylan
signature.asc
Description: signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
