Module Name: src
Committed By: christos
Date: Sat Aug 10 12:46:39 UTC 2019
Modified Files:
src/share/mk: bsd.README bsd.prog.mk
Log Message:
Make the X11 library lists consistent again.
To generate a diff of this commit:
cvs rdiff -u -r1.393 -r1.394 src/share/mk/bsd.README
cvs rdiff -u -r1.319 -r1.320 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.393 src/share/mk/bsd.README:1.394
--- src/share/mk/bsd.README:1.393 Wed Jul 24 05:28:29 2019
+++ src/share/mk/bsd.README Sat Aug 10 08:46:38 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.393 2019/07/24 09:28:29 roy Exp $
+# $NetBSD: bsd.README,v 1.394 2019/08/10 12:46:38 christos Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -1754,24 +1754,31 @@ DPADD Additional dependencies for the p
The following X-Windows libraries are predefined for DPADD:
+ LIBDPS?= ${DESTDIR}/usr/X11R7/lib/libdps.a
+ LIBFNTSTUBS?= ${DESTDIR}/usr/X11R7/lib/libfntstubs.a
+ LIBFONTCACHE?= ${DESTDIR}/usr/X11R7/lib/libfontcache.a
+ LIBFONTCONFIG?= ${DESTDIR}/usr/X11R7/lib/libfontconfig.a
+ LIBFONTENC?= ${DESTDIR}/usr/X11R7/lib/libfontenc.a
+ LIBFREETYPE?= ${DESTDIR}/usr/X11R7/lib/libfreetype.a
LIBFS?= ${DESTDIR}/usr/X11R7/lib/libFS.a
LIBGL?= ${DESTDIR}/usr/X11R7/lib/libGL.a
LIBGLU?= ${DESTDIR}/usr/X11R7/lib/libGLU.a
LIBICE?= ${DESTDIR}/usr/X11R7/lib/libICE.a
+ LIBLBXUTIL?= ${DESTDIR}/usr/X11R7/lib/liblbxutil.a
LIBSM?= ${DESTDIR}/usr/X11R7/lib/libSM.a
LIBX11?= ${DESTDIR}/usr/X11R7/lib/libX11.a
LIBX11_XCB?= ${DESTDIR}/usr/X11R7/lib/libX11-xcb.a
- LIBXTRAP?= ${DESTDIR}/usr/X11R7/lib/libXTrap.a
LIBXAU?= ${DESTDIR}/usr/X11R7/lib/libXau.a
LIBXAW?= ${DESTDIR}/usr/X11R7/lib/libXaw.a
LIBXCB?= ${DESTDIR}/usr/X11R7/lib/libxcb.a
LIBXDMCP?= ${DESTDIR}/usr/X11R7/lib/libXdmcp.a
LIBXEXT?= ${DESTDIR}/usr/X11R7/lib/libXext.a
- LIBXFONT?= ${DESTDIR}/usr/X11R7/lib/libXfont.a
LIBXFONT2?= ${DESTDIR}/usr/X11R7/lib/libXfont2.a
+ LIBXFONT?= ${DESTDIR}/usr/X11R7/lib/libXfont.a
LIBXFT?= ${DESTDIR}/usr/X11R7/lib/libXft.a
LIBXI?= ${DESTDIR}/usr/X11R7/lib/libXi.a
LIBXINERAMA?= ${DESTDIR}/usr/X11R7/lib/libXinerama.a
+ LIBXKBFILE?= ${DESTDIR}/usr/X11R7/lib/libxkbfile.a
LIBXMU?= ${DESTDIR}/usr/X11R7/lib/libXmu.a
LIBXMUU?= ${DESTDIR}/usr/X11R7/lib/libXmuu.a
LIBXPM?= ${DESTDIR}/usr/X11R7/lib/libXpm.a
@@ -1779,18 +1786,12 @@ DPADD Additional dependencies for the p
LIBXRENDER?= ${DESTDIR}/usr/X11R7/lib/libXrender.a
LIBXSS?= ${DESTDIR}/usr/X11R7/lib/libXss.a
LIBXT?= ${DESTDIR}/usr/X11R7/lib/libXt.a
+ LIBXTRAP?= ${DESTDIR}/usr/X11R7/lib/libXTrap.a
LIBXTST?= ${DESTDIR}/usr/X11R7/lib/libXtst.a
LIBXV?= ${DESTDIR}/usr/X11R7/lib/libXv.a
LIBXXF86DGA?= ${DESTDIR}/usr/X11R7/lib/libXxf86dga.a
LIBXXF86MISC?= ${DESTDIR}/usr/X11R7/lib/libXxf86misc.a
LIBXXF86VM?= ${DESTDIR}/usr/X11R7/lib/libXxf86vm.a
- LIBDPS?= ${DESTDIR}/usr/X11R7/lib/libdps.a
- LIBFNTSTUBS?= ${DESTDIR}/usr/X11R7/lib/libfntstubs.a
- LIBFONTCONFIG?= ${DESTDIR}/usr/X11R7/lib/libfontconfig.a
- LIBFONTENC?= ${DESTDIR}/usr/X11R7/lib/libfontenc.a
- LIBFREETYPE?= ${DESTDIR}/usr/X11R7/lib/libfreetype.a
- LIBLBXUTIL?= ${DESTDIR}/usr/X11R7/lib/liblbxutil.a
- LIBXKBFILE?= ${DESTDIR}/usr/X11R7/lib/libxkbfile.a
SHAREDSTRINGS If defined, a new .c.o rule is used that results in shared
strings, using xstr(1). Note that this will not work with
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.319 src/share/mk/bsd.prog.mk:1.320
--- src/share/mk/bsd.prog.mk:1.319 Mon Jan 21 16:11:54 2019
+++ src/share/mk/bsd.prog.mk Sat Aug 10 08:46:38 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.319 2019/01/21 21:11:54 christos Exp $
+# $NetBSD: bsd.prog.mk,v 1.320 2019/08/10 12:46:38 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -267,43 +267,13 @@ PAM_STATIC_DPADD=
.endif
# NB: If you are a library here, add it in bsd.README
-.for _lib in \
- FS \
- GL \
- GLU \
- ICE \
- SM \
- X11 \
- XTrap \
- Xau \
- Xaw \
- Xdmcp \
- Xext \
- Xfont2 \
- Xfont \
- Xft \
- Xi \
- Xinerama \
- Xmu \
- Xmuu \
- Xpm \
- Xrandr \
- Xrender \
- Xss \
- Xt \
- Xtst \
- Xv \
- Xxf86dga \
- Xxf86misc \
- Xxf86vm \
- dps \
- fntstubs \
- fontcache \
- fontconfig \
- fontenc \
- freetype \
- lbxutil \
- xkbfile
+# This list is sorted with -f so that it matches the order in bsd.README
+_X11LIBLIST= dps fntstubs fontcache fontconfig fontenc freetype FS GL GLU \
+ ICE lbxutil SM X11 X11_xcb Xau Xaw xcb Xdmcp Xext Xfont Xfont2 Xft Xi \
+ Xinerama xkbfile Xmu Xmuu Xpm Xrandr Xrender Xss Xt XTrap Xtst Xv Xxf86dga \
+ Xxf86misc Xxf86vm
+
+.for _lib in ${_X11LIBLIST}
.ifndef LIB${_lib:tu}
LIB${_lib:tu}= ${DESTDIR}${X11USRLIBDIR}/lib${_lib}.a
.MADE: ${LIB${_lib:tu}} # Note: ${DESTDIR} will be expanded
