Module Name: src
Committed By: maya
Date: Tue Apr 9 14:31:07 UTC 2019
Modified Files:
src/external/mit/xorg/lib/libGL: Makefile
Log Message:
Expand all @@ things in pkgconfig file.
claim TLS.
pick up the list of private libs from pkgsrc mesalib
GL_LIB got renamed to GL_PKGCONF_LIB.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/external/mit/xorg/lib/libGL/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.23 src/external/mit/xorg/lib/libGL/Makefile:1.24
--- src/external/mit/xorg/lib/libGL/Makefile:1.23 Sun Mar 10 10:51:58 2019
+++ src/external/mit/xorg/lib/libGL/Makefile Tue Apr 9 14:31:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/03/10 10:51:58 mrg Exp $
+# $NetBSD: Makefile,v 1.24 2019/04/09 14:31:06 maya Exp $
.include <bsd.own.mk>
@@ -203,11 +203,11 @@ PKGCONFIG_VERSION.gl= ${MESA_VER}
# XXX remove these from bsd.x11.mk
# XXX enable GLX TLS? it's enabled in the code, but not here..
PKGCONFIG_SED_FLAGS= \
- -e "s,@GL_PC_REQ_PRIV@,x11 xext,; \
- s,@GL_LIB@,GL,; \
- s,@GL_PC_LIB_PRIV@,-lm -lpthread,; \
+ -e "s,@GL_PC_REQ_PRIV@,libdrm x11 xext xdamage xfixes xcb-glx xcb-dri2 xxf86vm,; \
+ s,@GL_PKGCONF_LIB@,GL,; \
+ s,@GL_PC_LIB_PRIV@,-lm -lpthread -pthread,; \
s,@GL_PC_CFLAGS@,,; \
- s,@GLX_TLS@,no,"
+ s,@GLX_TLS@,yes,"
CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-format -Wno-constant-conversion \
