Module Name: src
Committed By: christos
Date: Sun Nov 28 15:47:33 UTC 2021
Modified Files:
src/share/mk: bsd.README bsd.lib.mk
Log Message:
For private and module libraries, build lint but do not install the lint
libraries. We want to lint the private library code and we want to be able
to link against the lint libraries, for example llib-largon2 from cgdconfig
which is accessed via PROGDPLIBS.
To generate a diff of this commit:
cvs rdiff -u -r1.422 -r1.423 src/share/mk/bsd.README
cvs rdiff -u -r1.387 -r1.388 src/share/mk/bsd.lib.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.422 src/share/mk/bsd.README:1.423
--- src/share/mk/bsd.README:1.422 Mon Nov 1 06:05:19 2021
+++ src/share/mk/bsd.README Sun Nov 28 10:47:33 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.422 2021/11/01 10:05:19 nia Exp $
+# $NetBSD: bsd.README,v 1.423 2021/11/28 15:47:33 christos Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -1341,12 +1341,12 @@ USE_SHLIBDIR If not "no", use ${SHLIBINS
Default: no
LIBISMODULE If not "no", install as ${LIB}.so (without the "lib" prefix),
- and act as "MKDEBUGLIB=no MKLINT=no MKPICINSTALL=no
- MKPROFILE=no MKSTATICLIB=no".
+ and act as "MKDEBUGLIB=no MKPICINSTALL=no MKPROFILE=no
+ MKSTATICLIB=no". Also do not install the lint library.
Default: no
-LIBISPRIVATE If not "no", act as "MKDEBUGLIB=no MKLINT=no MKPIC=no
- MKPROFILE=no", and don't install the (.a) library.
+LIBISPRIVATE If not "no", act as "MKDEBUGLIB=no MKPIC=no MKPROFILE=no",
+ and don't install the (.a) library or the lint library.
This is useful for "build only" helper libraries.
If set to "pic", then a _pic.a library is also produced,
so that it can be incorporated into other shared objects.
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.387 src/share/mk/bsd.lib.mk:1.388
--- src/share/mk/bsd.lib.mk:1.387 Tue Oct 26 23:06:59 2021
+++ src/share/mk/bsd.lib.mk Sun Nov 28 10:47:33 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.387 2021/10/27 03:06:59 ryo Exp $
+# $NetBSD: bsd.lib.mk,v 1.388 2021/11/28 15:47:33 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@@ -16,17 +16,16 @@ LIBISCXX?= no
.if ${LIBISMODULE} != "no"
_LIB_PREFIX?= # empty
MKDEBUGLIB:= no
-MKLINT:= no
MKPICINSTALL:= no
MKPROFILE:= no
MKSTATICLIB:= no
+_LINTINSTALL?= no
.else
_LIB_PREFIX?= lib
.endif
.if ${LIBISPRIVATE} != "no"
MKDEBUGLIB:= no
-MKLINT:= no
MKPICINSTALL:= no
. if defined(NOSTATICLIB) && ${MKPICLIB} != "no"
MKSTATICLIB:= no
@@ -34,8 +33,11 @@ MKSTATICLIB:= no
MKPIC:= no
. endif
MKPROFILE:= no
+_LINTINSTALL?= no
.endif
+_LINTINSTALL?= ${MKLINT}
+
##### Basic targets
.PHONY: checkver libinstall
realinstall: checkver libinstall
@@ -845,7 +847,7 @@ ${_DEST.DEBUG}/${_LIB.so.debug}: ${_LIB.
.endif
.endif
-.if ${MKLINT} != "no" && !empty(LOBJS)
+.if ${_LINTINSTALL} != "no" && !empty(LOBJS)
libinstall:: ${_DEST.LINT}/${_LIB.ln}
.PRECIOUS: ${_DEST.LINT}/${_LIB.ln}
