Module: Mesa Branch: staging/18.1 Commit: 0c927e8da9e51472ce216f9b5b940c2a78e44df1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0c927e8da9e51472ce216f9b5b940c2a78e44df1
Author: Emil Velikov <[email protected]> Date: Fri Feb 23 19:32:08 2018 +0000 autotools: use correct gl.pc LIBS when using glvnd This is more of a hack, since glvnd itself should be providing the file. Until that happens, ensure the libs is correctly set to -lGL CC: <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Adam Jackson <[email protected]> (cherry picked from commit 315c46cfdc3dbd4d51b74ab26df693725e947724) --- configure.ac | 9 +++++++++ src/mesa/gl.pc.in | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 32e82593cf..14f1af2b2f 100644 --- a/configure.ac +++ b/configure.ac @@ -1541,6 +1541,15 @@ fi AC_SUBST([GL_LIB]) AC_SUBST([OSMESA_LIB]) +dnl HACK when building glx + glvnd we ship gl.pc, despite that glvnd should do it +dnl Thus we need to use GL as a DSO name. +if test "x$enable_libglvnd" = xyes -a "x$enable_glx" != xno; then + GL_PKGCONF_LIB="GL" +else + GL_PKGCONF_LIB="$GL_LIB" +fi +AC_SUBST([GL_PKGCONF_LIB]) + # Check for libdrm PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED], [have_libdrm=yes], [have_libdrm=no]) diff --git a/src/mesa/gl.pc.in b/src/mesa/gl.pc.in index 181724b97b..680f742776 100644 --- a/src/mesa/gl.pc.in +++ b/src/mesa/gl.pc.in @@ -7,7 +7,7 @@ Name: gl Description: Mesa OpenGL library Requires.private: @GL_PC_REQ_PRIV@ Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -l@GL_LIB@ +Libs: -L${libdir} -l@GL_PKGCONF_LIB@ Libs.private: @GL_PC_LIB_PRIV@ Cflags: -I${includedir} @GL_PC_CFLAGS@ glx_tls: @GLX_TLS@ _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
