[Mesa-dev] [PATCH 06/14] meson: use driver_deps for gallium osmesa

[Marc Dietrich]

Hi Dylan,

Am Mittwoch, 29. November 2017, 00:30:27 CET schrieb Dylan Baker:
> Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
> ---
>  src/gallium/targets/osmesa/meson.build | 13 +++----------
>  1 file changed, 3 insertions(+), 10 deletions(-)
> 
> diff --git a/src/gallium/targets/osmesa/meson.build
> b/src/gallium/targets/osmesa/meson.build index 72f77724e44..e8e8e4822d8
> 100644
> --- a/src/gallium/targets/osmesa/meson.build
> +++ b/src/gallium/targets/osmesa/meson.build
> @@ -20,8 +20,6 @@
> 
>  osmesa_link_with = []
>  osmesa_link_args = []
> -osmesa_comp_args = ['-DGALLIUM_SOFTPIPE', '-DGALLIUM_TRACE']
> -osmesa_deps = []
> 
>  if with_shared_glapi
>    osmesa_link_with += libglapi
> @@ -32,18 +30,13 @@ if with_ld_version_script
>    ]
>  endif
> 
> -if with_llvm
> -  osmesa_comp_args += '-DGALLIUM_LLVMPIPE'
> -  osmesa_deps += dep_llvm
> -  osmesa_link_with += libllvmpipe
> -endif
>  # TODO: swr
> 
>  libosmesa = shared_library(
>    osmesa_lib_name,
>    'target.c',
> -  c_args : [c_vis_args, osmesa_comp_args],
> -  cpp_args : [cpp_vis_args, osmesa_comp_args],
> +  c_args : [c_vis_args, '-DGALLIUM_TRACE'],
> +  cpp_args : cpp_vis_args,
>    link_args : [ld_args_gc_sections, osmesa_link_args],
>    include_directories : [
>      inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_gallium_winsys,
> @@ -52,7 +45,7 @@ libosmesa = shared_library(
>    link_whole : [libosmesa_st],
>    link_with : [
>      libmesa_gallium, libgallium, libglapi_static, libws_null, libtrace,
> -    libsoftpipe, osmesa_link_with,
> +    driver_swrast,
>    ],
>    dependencies : [dep_selinux, dep_thread, dep_clock, dep_unwind,
> osmesa_deps], version : '8.0.0',
  ^^^^ 
this was just deleted. Did you actually tried to compile with this? Even when 
removing this deps, it still fails with "AttributeError: 'InternalDependency' 
object has no attribute 'is_linkable_target'"

Marc
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: This is a digitally signed message part.
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20171129/c2b50ad9/attachment.sig>