[Mesa-dev] [PATCH mesa] meson: fix keyword argument in declare_dependency()

Dylan Baker dylan at pnwbakers.com
Wed Dec 6 17:26:27 UTC 2017


oops! Okay, I'm thinking I'm going to write a linter for meson to help catch
these kind of mistakes because this isn't the first time that I've failed to
catch these kind of errors in code that I don't build locally.

Reviewed-by: Dylan Baker <dylan at pnwbakers.com>

Quoting Eric Engestrom (2017-12-06 05:31:00)
> `declare_dependency()` takes `compile_args`, not `c_args`.
> It was correct in all the other `declare_dependency()` from that commit.
> 
> Fixes: 0bbecc5a8548883f76a71 "meson: define driver dependencies"
> Cc: Dylan Baker <dylan at pnwbakers.com>
> Signed-off-by: Eric Engestrom <eric.engestrom at imgtec.com>
> ---
>  src/gallium/winsys/imx/drm/meson.build   | 2 +-
>  src/gallium/winsys/pl111/drm/meson.build | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/gallium/winsys/imx/drm/meson.build b/src/gallium/winsys/imx/drm/meson.build
> index a4af4688694d6ed9c300..4efd7bb0660ca70079a5 100644
> --- a/src/gallium/winsys/imx/drm/meson.build
> +++ b/src/gallium/winsys/imx/drm/meson.build
> @@ -28,6 +28,6 @@ libimxdrm = static_library(
>  )
>  
>  driver_imx = declare_dependency(
> -  c_args : '-DGALLIUM_IMX',
> +  compile_args : '-DGALLIUM_IMX',
>    link_with : libimxdrm,
>  )
> diff --git a/src/gallium/winsys/pl111/drm/meson.build b/src/gallium/winsys/pl111/drm/meson.build
> index 84c26f57e15f97a21ca8..9cb6faf31e21e57bd6ab 100644
> --- a/src/gallium/winsys/pl111/drm/meson.build
> +++ b/src/gallium/winsys/pl111/drm/meson.build
> @@ -31,6 +31,6 @@ libpl111winsys = static_library(
>  )
>  
>  driver_pl111 = declare_dependency(
> -  c_args : '-DGALLIUM_PL111',
> +  compile_args : '-DGALLIUM_PL111',
>    link_with : libpl111winsys,
>  )
> -- 
> Cheers,
>   Eric
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20171206/67d18914/attachment.sig>


More information about the mesa-dev mailing list