diff options
| author | Dave Airlie <[email protected]> | 2020-03-18 06:15:06 +1000 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-03-17 21:14:38 +0000 |
| commit | 040ce9a1b3b596d34e224cf3be42747bdadc7163 (patch) | |
| tree | c90c9c2f3f07b60e00e624c28613afd259c4879c /src/gallium/targets | |
| parent | 8dc5e174c7b96b6d4b5a6923068410f298167a39 (diff) | |
gallium: fix build with latest meson and gcc10
In Fedora 32 build was failing with meson-0.53.2-1.git88e40c7.fc32
and gcc-10.0.1-0.9.fc32.x86_64.
Worked with meson-0.53.1-1 and same gcc.
/usr/bin/ld: src/gallium/state_trackers/dri/libdri.a(dri2.c.o): in function `dri2_interop_export_object':
/home/airlied/devel/mesa/mesa/build/../src/gallium/state_trackers/dri/dri2.c:1813: undefined reference to `st_finalize_texture'
/usr/bin/ld: src/gallium/state_trackers/dri/libdri.a(dri_screen.c.o): in function `dri_init_screen_helper':
/home/airlied/devel/mesa/mesa/build/../src/gallium/state_trackers/dri/dri_screen.c:580: undefined reference to `st_gl_api_create'
Moving this around seems to fix it.
Cc: [email protected]
Reviewed-by: Dylan Baker <[email protected]>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4220>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4220>
Diffstat (limited to 'src/gallium/targets')
| -rw-r--r-- | src/gallium/targets/dri/meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index 954b2182ce4..ae25a21cb33 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -49,7 +49,7 @@ libgallium_dri = shared_library( link_args : [ld_args_build_id, ld_args_gc_sections, gallium_dri_ld_args], link_depends : gallium_dri_link_depends, link_with : [ - libmesa_gallium, libdricommon, libmegadriver_stub, libdri, libgalliumvl, + libdri, libmesa_gallium, libdricommon, libmegadriver_stub, libgalliumvl, libgallium, libglapi, libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri, ], |