Module Name: src
Committed By: christos
Date: Sat Apr 4 03:04:58 UTC 2020
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Add all the dependent libraries and sort
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.43 src/external/mit/xorg/lib/gallium/Makefile:1.44
--- src/external/mit/xorg/lib/gallium/Makefile:1.43 Fri Jan 31 16:13:40 2020
+++ src/external/mit/xorg/lib/gallium/Makefile Fri Apr 3 23:04:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2020/01/31 21:13:40 jmcneill Exp $
+# $NetBSD: Makefile,v 1.44 2020/04/04 03:04:58 christos Exp $
# Link the gallium mega driver.
@@ -25,7 +25,6 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libd
CFLAGS+= -pthread
LDFLAGS+= -pthread
-LIBDPLIBS+= pthread ${.CURDIR}/../../../../../lib/libpthread
GALLIUM_SUBDIRS= \
auxiliary \
@@ -953,10 +952,11 @@ CPPFLAGS.${_s}+= -I${X11SRCDIR.Mesa}/src
.if ${BUILD_RADEON} == 1
CFLAGS+= -pthread
LDFLAGS+= -pthread
-LIBDPLIBS+= pthread ${.CURDIR}/../../../../../lib/libpthread
.endif
-LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
+LIBDPLIBS+= X11-xcb ${.CURDIR}/../libX11/libX11-xcb
+LIBDPLIBS+= xcb-dri2 ${.CURDIR}/../libxcb/dri2
+LIBDPLIBS+= xcb ${.CURDIR}/../libxcb/libxcb
.if ${BUILD_RADEON} == 1 || ${BUILD_NOUVEAU} == 1
LIBDPLIBS+= drm ${.CURDIR}/../libdrm
.if ${BUILD_I915} == 1
@@ -973,10 +973,11 @@ LIBDPLIBS+= drm_nouveau ${.CURDIR}/../l
LIBDPLIBS+= glapi ${.CURDIR}/../libglapi
LIBDPLIBS+= expat ${.CURDIR}/../../../../../external/mit/expat/lib/libexpat
LIBDPLIBS+= terminfo ${.CURDIR}/../../../../../lib/libterminfo
-LIBDPLIBS+= z ${.CURDIR}/../../../../../lib/libz
LIBDPLIBS+= execinfo ${.CURDIR}/../../../../../lib/libexecinfo
-LIBDPLIBS+= X11-xcb ${.CURDIR}/../libX11/libX11-xcb
-LIBDPLIBS+= xcb-dri2 ${.CURDIR}/../libxcb/dri2
+
+LIBDPLIBS+= elf ${NETBSDSRCDIR}/external/bsd/elftoolchain/lib/libelf
+LIBDPLIBS+= z ${.CURDIR}/../../../../../lib/libz
+LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
# gallium drivers requiring LLVM
.if ${BUILD_LLVMPIPE} == 1 || ${BUILD_RADEON} == 1
