Module Name: src
Committed By: nia
Date: Thu Oct 14 11:45:46 UTC 2021
Modified Files:
src/share/mk: bsd.README bsd.own.mk
Log Message:
mk: Enable MKARGON2 now that this stuff works.
To generate a diff of this commit:
cvs rdiff -u -r1.418 -r1.419 src/share/mk/bsd.README
cvs rdiff -u -r1.1263 -r1.1264 src/share/mk/bsd.own.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.418 src/share/mk/bsd.README:1.419
--- src/share/mk/bsd.README:1.418 Sun Sep 26 15:52:40 2021
+++ src/share/mk/bsd.README Thu Oct 14 11:45:46 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.418 2021/09/26 15:52:40 maya Exp $
+# $NetBSD: bsd.README,v 1.419 2021/10/14 11:45:46 nia Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -113,6 +113,9 @@ MAKEVERBOSE Control how "verbose" the st
3 Ignore the effect of the "@" prefix in make commands
4 Trace shell commands using the shell's -x flag
+MKARGON2 If "no", don't build support for Argon2 into libcrypt.
+ Default: yes
+
MKATF If "no", don't build the Automated Testing Framework (ATF),
which includes the libatf-c, libatf-c++ and libatf-sh libraries
and the various command line tools. Also, because the build of
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1263 src/share/mk/bsd.own.mk:1.1264
--- src/share/mk/bsd.own.mk:1.1263 Thu Sep 30 20:02:54 2021
+++ src/share/mk/bsd.own.mk Thu Oct 14 11:45:46 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1263 2021/09/30 20:02:54 jmcneill Exp $
+# $NetBSD: bsd.own.mk,v 1.1264 2021/10/14 11:45:46 nia Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1140,6 +1140,7 @@ MKSTATICPIE?= no
# MK* options which default to "yes".
#
_MKVARS.yes= \
+ MKARGON2 \
MKATF \
MKBINUTILS \
MKBSDTAR \
@@ -1281,7 +1282,6 @@ MKLLVMRT.aarch64= yes
# sorted with at most one letter per line.
#
_MKVARS.no= \
- MKARGON2 \
MKARZERO \
MKBSDGREP \
MKCATPAGES MKCOMPATTESTS MKCOMPATX11 MKCTF \
