[Mesa-dev] [PATCH] scons: gallium: link against nir as needed

[Jose Fonseca]

On 16/05/16 18:55, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
>
> ... otherwise we'll produce uncomplete binaries with introduction of NIR
> as alternative IR with next commits.
>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>
> Hi Rob,
>
> A slightly different patch which seems to work fine on Linux and Windows
> [1] based on the following series [2]. Feel free to apply any extra
> polish if needed.
>
> [1] https://ci.appveyor.com/project/evelikov/mesa-4up2g
> [2] https://github.com/evelikov/Mesa/commits/scons-nir-linking
>
>   src/gallium/targets/dri/SConscript            | 1 +
>   src/gallium/targets/haiku-softpipe/SConscript | 1 +
>   src/gallium/targets/libgl-gdi/SConscript      | 2 +-
>   src/gallium/targets/libgl-xlib/SConscript     | 1 +
>   src/gallium/targets/osmesa/SConscript         | 1 +
>   5 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/src/gallium/targets/dri/SConscript b/src/gallium/targets/dri/SConscript
> index bf3baa7..d7a8cbd 100644
> --- a/src/gallium/targets/dri/SConscript
> +++ b/src/gallium/targets/dri/SConscript
> @@ -44,6 +44,7 @@ env.Prepend(LIBS = [
>       compiler,
>       mesa,
>       glsl,
> +    nir,
>       gallium,
>       megadrivers_stub,
>       dri_common,
> diff --git a/src/gallium/targets/haiku-softpipe/SConscript b/src/gallium/targets/haiku-softpipe/SConscript
> index b7c1373..f80c167 100644
> --- a/src/gallium/targets/haiku-softpipe/SConscript
> +++ b/src/gallium/targets/haiku-softpipe/SConscript
> @@ -9,6 +9,7 @@ env.Prepend(LIBS = [
>       compiler,
>       mesa,
>       glsl,
> +    nir,
>       gallium
>   ])
>
> diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript
> index 3a63e3e..53284e5 100644
> --- a/src/gallium/targets/libgl-gdi/SConscript
> +++ b/src/gallium/targets/libgl-gdi/SConscript
> @@ -50,7 +50,7 @@ if env['gles']:
>   opengl32 = env.SharedLibrary(
>       target ='opengl32',
>       source = sources,
> -    LIBS = wgl + ws_gdi + glapi + compiler + mesa + drivers + gallium + glsl + env['LIBS'],
> +    LIBS = wgl + ws_gdi + glapi + compiler + mesa + drivers + gallium + glsl + nir + env['LIBS'],
>   )
>
>   env.Alias('opengl32', opengl32)
> diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript
> index 1c816ff..0a4f31b 100644
> --- a/src/gallium/targets/libgl-xlib/SConscript
> +++ b/src/gallium/targets/libgl-xlib/SConscript
> @@ -32,6 +32,7 @@ env.Prepend(LIBS = [
>       compiler,
>       mesa,
>       glsl,
> +    nir,
>       gallium,
>   ])
>
> diff --git a/src/gallium/targets/osmesa/SConscript b/src/gallium/targets/osmesa/SConscript
> index eeaacbc..7a2a00c 100644
> --- a/src/gallium/targets/osmesa/SConscript
> +++ b/src/gallium/targets/osmesa/SConscript
> @@ -17,6 +17,7 @@ env.Prepend(LIBS = [
>       gallium,
>       trace,
>       glsl,
> +    nir,
>       mesautil,
>       softpipe
>   ])
>

Looks alright to me.

Acked-by: Jose Fonseca <jfonseca at vmware.com>