--- origsrc/mesa-18.0.1/src/gallium/targets/osmesa/meson.build	2018-04-18 10:47:54.000000000 -0400
+++ src/mesa-18.0.1/src/gallium/targets/osmesa/meson.build	2018-05-06 12:51:07.040841000 -0400
@@ -43,9 +43,9 @@ libosmesa = shared_library(
     inc_gallium_drivers,
   ],
   link_depends : osmesa_link_deps,
-  link_whole : [libosmesa_st],
+  link_whole : [libosmesa_st, libglapi_static],
   link_with : [
-    libmesa_gallium, libgallium, libglapi_static, libws_null, libtrace,
+    libmesa_gallium, libgallium, libws_null, libtrace,
     osmesa_link_with,
   ],
   dependencies : [