Module Name: src
Committed By: maya
Date: Sun Mar 29 21:06:03 UTC 2020
Modified Files:
src/external/mit/xorg/lib: libloader.mk
src/external/mit/xorg/lib/libGL: Makefile
Log Message:
Define GL_LIB_NAME somewhere that applies to dri_common.c, which is the
file that needs it.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libloader.mk
cvs rdiff -u -r1.28 -r1.29 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/libloader.mk
diff -u src/external/mit/xorg/lib/libloader.mk:1.5 src/external/mit/xorg/lib/libloader.mk:1.6
--- src/external/mit/xorg/lib/libloader.mk:1.5 Fri Feb 7 19:00:18 2020
+++ src/external/mit/xorg/lib/libloader.mk Sun Mar 29 21:06:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: libloader.mk,v 1.5 2020/02/07 19:00:18 jmcneill Exp $
+# $NetBSD: libloader.mk,v 1.6 2020/03/29 21:06:03 maya Exp $
# makefile fragment for mesa src/loader
@@ -15,7 +15,6 @@ CPPFLAGS.${_f}= -I${X11SRCDIR.Mesa}/src
-I${X11SRCDIR.Mesa}/../src/util \
-I${X11SRCDIR.Mesa}/src/mesa \
-I${X11SRCDIR.Mesa}/src \
- -DGL_LIB_NAME=\"libGL.so.3\" \
-DDEFAULT_DRIVER_DIR=\"${X11USRLIBDIR}/modules/dri\" \
-DUSE_DRICONF \
-DHAVE_LIBDRM
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.28 src/external/mit/xorg/lib/libGL/Makefile:1.29
--- src/external/mit/xorg/lib/libGL/Makefile:1.28 Tue Sep 24 19:29:42 2019
+++ src/external/mit/xorg/lib/libGL/Makefile Sun Mar 29 21:06:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/09/24 19:29:42 maya Exp $
+# $NetBSD: Makefile,v 1.29 2020/03/29 21:06:03 maya Exp $
.include <bsd.own.mk>
@@ -117,7 +117,8 @@ SRCS.dri= \
.for fn in ${SRCS.dri}
CPPFLAGS.${fn}= \
- -I${X11SRCDIR.Mesa}/src
+ -I${X11SRCDIR.Mesa}/src \
+ -DGL_LIB_NAME="\"libGL.so.${SHLIB_MAJOR}\""
.endfor
.endif
