From a3eb254cfc27a44a47c3d4575dd1ce8fffea7ef8 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 18 Mar 2020 06:15:06 +1000 Subject: [PATCH] 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 Tested-by: Marge Bot Part-of: (cherry picked from commit 040ce9a1b3b596d34e224cf3be42747bdadc7163) --- .pick_status.json | 2 +- src/gallium/targets/dri/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index f4ccd1acb0e..1302176ed96 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -85,7 +85,7 @@ "description": "gallium: fix build with latest meson and gcc10", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, 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, ],