Mesa (master): configure.ac: add missing llvm dependencies to .pc files

Chuck Atkins chuckatkins at kemper.freedesktop.org
Thu Jan 25 20:00:10 UTC 2018


Module: Mesa
Branch: master
Commit: 6ac5e851f1a0b83d84156bc79983fd9527d4c296
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6ac5e851f1a0b83d84156bc79983fd9527d4c296

Author: Chuck Atkins <chuck.atkins at kitware.com>
Date:   Tue Jan 23 08:52:46 2018 -0500

configure.ac: add missing llvm dependencies to .pc files

v2: Only add as dependencies for gallium-osmesa and gallium-xlib

CC: <mesa-stable at lists.freedesktop.org>
Signed-of-by: Chuck Atkins <chuck.atkins at kitware.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 configure.ac | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/configure.ac b/configure.ac
index 9bfe1e3ecd..ae5162319d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2780,6 +2780,18 @@ if test "x$enable_llvm" = xyes; then
             fi
         fi
     fi
+
+    dnl The gallium-xlib GLX and gallium OSMesa targets directly embed the
+    dnl swr/llvmpipe driver into the final binary.  Adding LLVM_LIBS results in 
+    dnl the LLVM library propagated in the Libs.private of the respective .pc
+    dnl file which ensures complete dependency information when statically
+    dnl linking.
+    if test "x$enable_glx" == xgallium-xlib; then
+        GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $LLVM_LIBS"
+    fi
+    if test "x$enable_gallium_osmesa" = xyes; then
+        OSMESA_PC_LIB_PRIV="$OSMESA_PC_LIB_PRIV $LLVM_LIBS"
+    fi
 fi
 
 AM_CONDITIONAL(HAVE_GALLIUM_SVGA, test "x$HAVE_GALLIUM_SVGA" = xyes)




More information about the mesa-commit mailing list