[src/trunk]: src/external/mit/xorg/lib Define GL_LIB_NAME somewhere that appl...

[maya <maya%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1112eddc8e59
branches:  trunk
changeset: 746371:1112eddc8e59
user:      maya <maya%NetBSD.org@localhost>
date:      Sun Mar 29 21:06:03 2020 +0000

description:
Define GL_LIB_NAME somewhere that applies to dri_common.c, which is the
file that needs it.

diffstat:

 external/mit/xorg/lib/libGL/Makefile |  5 +++--
 external/mit/xorg/lib/libloader.mk   |  3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 44ea5d0ae186 -r 1112eddc8e59 external/mit/xorg/lib/libGL/Makefile
--- a/external/mit/xorg/lib/libGL/Makefile      Sun Mar 29 19:50:46 2020 +0000
+++ b/external/mit/xorg/lib/libGL/Makefile      Sun Mar 29 21:06:03 2020 +0000
@@ -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 @@
 
 .for fn in ${SRCS.dri}
 CPPFLAGS.${fn}= \
-       -I${X11SRCDIR.Mesa}/src
+       -I${X11SRCDIR.Mesa}/src \
+       -DGL_LIB_NAME="\"libGL.so.${SHLIB_MAJOR}\""
 .endfor
 .endif
 
diff -r 44ea5d0ae186 -r 1112eddc8e59 external/mit/xorg/lib/libloader.mk
--- a/external/mit/xorg/lib/libloader.mk        Sun Mar 29 19:50:46 2020 +0000
+++ b/external/mit/xorg/lib/libloader.mk        Sun Mar 29 21:06:03 2020 +0000
@@ -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 @@
                        -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