Discussion:
[PATCH mesa] meson: fix keyword argument in declare_dependency()
Add Reply
Eric Engestrom
2017-12-06 13:31:00 UTC
Reply
Permalink
Raw Message
`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 <***@pnwbakers.com>
Signed-off-by: Eric Engestrom <***@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
Dylan Baker
2017-12-06 17:26:27 UTC
Reply
Permalink
Raw Message
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 <***@pnwbakers.com>

Quoting Eric Engestrom (2017-12-06 05:31:00)
Post by Eric Engestrom
`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"
---
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
Loading...