diff options
| author | Eric Engestrom <[email protected]> | 2017-12-04 15:06:03 +0000 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2017-12-07 17:21:03 +0000 |
| commit | f0337f0f701fc904d7c32556b8621438b2a45b3f (patch) | |
| tree | 42ba9cf0b2c06f2d5707942235c71f033485b7ea | |
| parent | 5f81a43535e8512cef26ea3dcd1e3a489bd5a1bb (diff) | |
meson: fix pl111 dependency on vc4
src/gallium/winsys/pl111/drm/libpl111winsys.a(pl111_drm_winsys.c.o): In function `pl111_drm_screen_create':
pl111_drm_winsys.c:(.text+0x33): undefined reference to `vc4_drm_screen_create_renderonly'
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Dylan Baker <[email protected]>
| -rw-r--r-- | meson.build | 3 | ||||
| -rw-r--r-- | src/gallium/meson.build | 10 | ||||
| -rw-r--r-- | src/gallium/winsys/pl111/drm/meson.build | 1 |
3 files changed, 9 insertions, 5 deletions
diff --git a/meson.build b/meson.build index 3e8ea7d17e0..1ea63fb1291 100644 --- a/meson.build +++ b/meson.build @@ -190,6 +190,9 @@ endif if with_gallium_imx and not with_gallium_etnaviv error('IMX driver requires etnaviv driver') endif +if with_gallium_pl111 and not with_gallium_vc4 + error('pl111 driver requires vc4 driver') +endif dep_libdrm_intel = [] if with_dri_i915 or with_gallium_i915 diff --git a/src/gallium/meson.build b/src/gallium/meson.build index 7e841633a9c..2baca8a97ca 100644 --- a/src/gallium/meson.build +++ b/src/gallium/meson.build @@ -72,17 +72,17 @@ if with_gallium_freedreno else driver_freedreno = declare_dependency() endif -if with_gallium_pl111 - subdir('winsys/pl111/drm') -else - driver_pl111 = declare_dependency() -endif if with_gallium_vc4 subdir('winsys/vc4/drm') subdir('drivers/vc4') else driver_vc4 = declare_dependency() endif +if with_gallium_pl111 + subdir('winsys/pl111/drm') +else + driver_pl111 = declare_dependency() +endif if with_gallium_vc5 subdir('winsys/vc5/drm') subdir('drivers/vc5') diff --git a/src/gallium/winsys/pl111/drm/meson.build b/src/gallium/winsys/pl111/drm/meson.build index 8ba03e3f979..9cb6faf31e2 100644 --- a/src/gallium/winsys/pl111/drm/meson.build +++ b/src/gallium/winsys/pl111/drm/meson.build @@ -27,6 +27,7 @@ libpl111winsys = static_library( ], c_args : [c_vis_args], dependencies: dep_libdrm, + link_with : libvc4winsys, ) driver_pl111 = declare_dependency( |