build: Don't overlink gallium xlib target

Currently gallium's xlib target will fail to link due to multiple
definitions of all the symbols in libmesautil, this only shows up in
autotools, and not in meson due to differences in the way that meson and
autotools handle linking static archives into static archives. Autotools
uses -Wl,--whole-archive implicitly, meson requires this behavior to be
opted-into. The solution is just to remove libmesautils from the
libgl-xlib target, since it will get all of those symbols form
libmesagallium.

I've dropped the link from meson as well, it doesn't seem to hurt
anything and should make linking just a little faster.

Fixes: 8396043f304bb2a752130230055605c5c966e89f
       ("Replace uses of _mesa_bitcount with util_bitcount")
bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107923
Tested-by: Brian Paul <brianp@vmware.com>
Tested-by: Vinson Lee <vlee@freedesktop.org>
Cc: Sergii Romantsov<sergii.romantsov@globallogic.com>

diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am
index dc7c6edfdb034d066a279879a60bc628f1a17a10..56d548e7c1585d0a26bc2b3d927e35de6057e3de 100644 (file)
--- a/src/gallium/targets/libgl-xlib/Makefile.am
+++ b/src/gallium/targets/libgl-xlib/Makefile.am
@@ -62,7 +62,6 @@ lib@GL_LIB@_la_LIBADD = \
        $(top_builddir)/src/mapi/glapi/libglapi.la \
        $(top_builddir)/src/mesa/libmesagallium.la \
        $(top_builddir)/src/gallium/auxiliary/libgallium.la \
-       $(top_builddir)/src/util/libmesautil.la \
        $(SHARED_GLAPI_LIB) \
        $(GL_LIB_DEPS) \
        $(CLOCK_LIB) \

diff --git a/src/gallium/targets/libgl-xlib/meson.build b/src/gallium/targets/libgl-xlib/meson.build
index 3d197ba719380ab084ea88b0cfdec958494233e1..921f948ca3a5d8d7478cdc4fdbe1deb347c2d601 100644 (file)
--- a/src/gallium/targets/libgl-xlib/meson.build
+++ b/src/gallium/targets/libgl-xlib/meson.build
@@ -49,7 +49,7 @@ libgl = shared_library(
   link_depends : gallium_xlib_link_depends,
   link_with : [
     libxlib, libws_xlib, libglapi_static,
-    libgallium, libmesa_util, libmesa_gallium, gallium_xlib_link_with,
+    libgallium, libmesa_gallium, gallium_xlib_link_with,
   ],
   dependencies : [dep_thread, dep_clock, dep_unwind, driver_swrast, driver_swr],
   install : true,