Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk For private and module libraries, build lint but do...



details:   https://anonhg.NetBSD.org/src/rev/1c9f3040c5d9
branches:  trunk
changeset: 1026549:1c9f3040c5d9
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Nov 28 15:47:33 2021 +0000

description:
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.

diffstat:

 share/mk/bsd.README |  10 +++++-----
 share/mk/bsd.lib.mk |  10 ++++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diffs (75 lines):

diff -r 8a586ccedda8 -r 1c9f3040c5d9 share/mk/bsd.README
--- a/share/mk/bsd.README       Sun Nov 28 15:26:22 2021 +0000
+++ b/share/mk/bsd.README       Sun Nov 28 15:47:33 2021 +0000
@@ -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 @@
                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.
diff -r 8a586ccedda8 -r 1c9f3040c5d9 share/mk/bsd.lib.mk
--- a/share/mk/bsd.lib.mk       Sun Nov 28 15:26:22 2021 +0000
+++ b/share/mk/bsd.lib.mk       Sun Nov 28 15:47:33 2021 +0000
@@ -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 @@
 .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 @@
 MKPIC:=                no
 . endif
 MKPROFILE:=    no
+_LINTINSTALL?= no
 .endif
 
+_LINTINSTALL?= ${MKLINT}
+
 ##### Basic targets
 .PHONY:                checkver libinstall
 realinstall:   checkver libinstall
@@ -845,7 +847,7 @@
 .endif
 .endif
 
-.if ${MKLINT} != "no" && !empty(LOBJS)
+.if ${_LINTINSTALL} != "no" && !empty(LOBJS)
 libinstall:: ${_DEST.LINT}/${_LIB.ln}
 .PRECIOUS: ${_DEST.LINT}/${_LIB.ln}
 



Home | Main Index | Thread Index | Old Index