Mon Jul 12 09:40:31 2021 UTC ()
look for libglapi in ${OLD_SUFFIX}.  noted by gson.


(mrg)
diff -r1.5 -r1.6 src/external/mit/xorg/lib/libEGL/Makefile
cvs diff -r1.5 -r1.6 src/external/mit/xorg/lib/libEGL/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/libEGL/Makefile 2019/09/24 19:29:42 1.5
+++ src/external/mit/xorg/lib/libEGL/Makefile 2021/07/12 09:40:31 1.6
@@ -1,17 +1,19 @@ @@ -1,17 +1,19 @@
1# $NetBSD: Makefile,v 1.5 2019/09/24 19:29:42 maya Exp $ 1# $NetBSD: Makefile,v 1.6 2021/07/12 09:40:31 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
 5.include "../mesa-which.mk"
 6
5LIB= EGL 7LIB= EGL
6LIBISCXX= yes 8LIBISCXX= yes
7 9
8SHLIB_MAJOR= 0 10SHLIB_MAJOR= 0
9SHLIB_MINOR= 0 11SHLIB_MINOR= 0
10 12
11#SUBDIR= internal 13#SUBDIR= internal
12 14
13# egl 15# egl
14.PATH: ${X11SRCDIR.Mesa}/src/egl/main 16.PATH: ${X11SRCDIR.Mesa}/src/egl/main
15SRCS.egl= \ 17SRCS.egl= \
16 eglapi.c \ 18 eglapi.c \
17 eglarray.c \ 19 eglarray.c \
@@ -88,27 +90,27 @@ CPPFLAGS+= ${X11FLAGS.THREADLIB} \ @@ -88,27 +90,27 @@ CPPFLAGS+= ${X11FLAGS.THREADLIB} \
88 -DHAVE_MINCORE 90 -DHAVE_MINCORE
89 91
90.include "../libloader.mk" 92.include "../libloader.mk"
91 93
92CFLAGS+= -fvisibility=hidden -fno-strict-aliasing -fno-builtin-memcmp 94CFLAGS+= -fvisibility=hidden -fno-strict-aliasing -fno-builtin-memcmp
93CFLAGS+= -pthread 95CFLAGS+= -pthread
94 96
95# XXX missing: xcb-present 97# XXX missing: xcb-present
96LIBDPLIBS= Xext ${.CURDIR}/../libXext \ 98LIBDPLIBS= Xext ${.CURDIR}/../libXext \
97 X11 ${.CURDIR}/../libX11/dynamic \ 99 X11 ${.CURDIR}/../libX11/dynamic \
98 Xfixes ${.CURDIR}/../libXfixes \ 100 Xfixes ${.CURDIR}/../libXfixes \
99 Xdamage ${.CURDIR}/../libXdamage \ 101 Xdamage ${.CURDIR}/../libXdamage \
100 Xdmcp ${.CURDIR}/../libXdmcp \ 102 Xdmcp ${.CURDIR}/../libXdmcp \
101 glapi ${.CURDIR}/../libglapi \ 103 glapi ${.CURDIR}/../libglapi${OLD_SUFFIX} \
102 drm ${.CURDIR}/../libdrm \ 104 drm ${.CURDIR}/../libdrm \
103 gbm ${.CURDIR}/../libgbm \ 105 gbm ${.CURDIR}/../libgbm \
104 xshmfence ${.CURDIR}/../libxshmfence \ 106 xshmfence ${.CURDIR}/../libxshmfence \
105 X11-xcb ${.CURDIR}/../libX11/libX11-xcb \ 107 X11-xcb ${.CURDIR}/../libX11/libX11-xcb \
106 xcb-dri2 ${.CURDIR}/../libxcb/dri2 \ 108 xcb-dri2 ${.CURDIR}/../libxcb/dri2 \
107 xcb-glx ${.CURDIR}/../libxcb/glx \ 109 xcb-glx ${.CURDIR}/../libxcb/glx \
108 xcb-xfixes ${.CURDIR}/../libxcb/xfixes \ 110 xcb-xfixes ${.CURDIR}/../libxcb/xfixes \
109 xcb-sync ${.CURDIR}/../libxcb/sync \ 111 xcb-sync ${.CURDIR}/../libxcb/sync \
110 xcb ${.CURDIR}/../libxcb/libxcb \ 112 xcb ${.CURDIR}/../libxcb/libxcb \
111 expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \ 113 expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \
112 m ${NETBSDSRCDIR}/lib/libm \ 114 m ${NETBSDSRCDIR}/lib/libm \
113 pthread ${NETBSDSRCDIR}/lib/libpthread 115 pthread ${NETBSDSRCDIR}/lib/libpthread
114 116