Quoting Pierre Moreau (2019-01-07 12:30:17) > The version exported by LLVM in its CMake configuration files can > include the \u201csvn\u201d suffix when building a development version (for > example \u201c8.0.0svn\u201d). However the exported clang headers are still > found > under \u201clib/clang/8.0.0/\u201d, without the \u201csvn\u201d suffix. > Meson takes care of removing the \u201csvn\u201d suffix from the version when > using the dependency\u2019s `version()` method. > > This processing is already performed in \u201cconfigure.ac\u201d when using > autotools. > > Signed-off-by: Pierre Moreau <[email protected]> > --- > v2: > * Replace the initial solution using a `split()`, by instead directly > using Meson\u2019s own `version()` function. (Dylan Baker) > * Update the commit message to mention the `version()` method. > > src/gallium/state_trackers/clover/meson.build | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/gallium/state_trackers/clover/meson.build > b/src/gallium/state_trackers/clover/meson.build > index a6729af2fb8..62ac5f5278d 100644 > --- a/src/gallium/state_trackers/clover/meson.build > +++ b/src/gallium/state_trackers/clover/meson.build > @@ -53,7 +53,7 @@ libclllvm = static_library( > > '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('libexecdir')), > '-DCLANG_RESOURCE_DIR="@0@"'.format(join_paths( > dep_llvm.get_configtool_variable('libdir'), 'clang', > - dep_llvm.get_configtool_variable('version'), 'include', > + dep_llvm.version(), 'include', > )), > ], > dependencies : [dep_llvm, dep_elf], > -- > 2.20.1 >
Reviewed-by: Dylan Baker <[email protected]>
signature.asc
Description: signature
_______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
