gallium: fix build with latest meson and gcc10
authorDave Airlie <airlied@redhat.com>
Tue, 17 Mar 2020 20:15:06 +0000 (06:15 +1000)
committerMarge Bot <eric+marge@anholt.net>
Tue, 17 Mar 2020 21:14:38 +0000 (21:14 +0000)
commit040ce9a1b3b596d34e224cf3be42747bdadc7163
treec90c9c2f3f07b60e00e624c28613afd259c4879c
parent8dc5e174c7b96b6d4b5a6923068410f298167a39
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: mesa-stable@lists.freedesktop.org
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4220>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4220>
src/gallium/targets/dri/meson.build