[src/trunk]: src/sbin/cgdconfig Build argon2 inline so that crunched programs...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/50a8627b25d9
branches:  trunk
changeset: 366139:50a8627b25d9
user:      christos <christos%NetBSD.org@localhost>
date:      Sun May 15 19:53:27 2022 +0000

description:
Build argon2 inline so that crunched programs work. I also disabled threads
for now; we can put them back if needed.

diffstat:

 sbin/cgdconfig/Makefile |  20 ++++++--------------
 1 files changed, 6 insertions(+), 14 deletions(-)

diffs (41 lines):

diff -r 09fbe11ab6a1 -r 50a8627b25d9 sbin/cgdconfig/Makefile
--- a/sbin/cgdconfig/Makefile   Sun May 15 18:27:35 2022 +0000
+++ b/sbin/cgdconfig/Makefile   Sun May 15 19:53:27 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2021/11/28 02:01:30 christos Exp $
+# $NetBSD: Makefile,v 1.18 2022/05/15 19:53:27 christos Exp $
 
 RUMPPRG=cgdconfig
 MAN=   cgdconfig.8
@@ -12,10 +12,6 @@
        params.c                \
        utils.c
 
-.if ${MKARGON2} != "no"
-SRCS+= argon2_utils.c
-.endif
-
 CPPFLAGS+= -I${.CURDIR} -I. -DYY_NO_INPUT
 
 YHEADER=1
@@ -24,15 +20,11 @@
 LDADD=  -lutil -lcrypt -ly -ll
 
 .if ${MKARGON2} != "no"
-ARGON2DIR=     ${NETBSDSRCDIR}/external/apache2/argon2
-ARGON2OBJDIR!= cd ${ARGON2DIR}/lib/libargon2 && ${PRINTOBJDIR}
-CPPFLAGS+=     -I${NETBSDSRCDIR}/external/apache2/argon2/dist/phc-winner-argon2/include
-CPPFLAGS+=     -DHAVE_ARGON2
-
-PROGDPLIBS+=   argon2 ${ARGON2DIR}/lib/libargon2
-
-LDADD+=                -lpthread
-DPADD+=                ${LIBPTHREAD}
+ARGON2DIR=     ${NETBSDSRCDIR}/external/apache2/argon2/dist/phc-winner-argon2
+CPPFLAGS+=     -I${ARGON2DIR}/include -I${ARGON2DIR}/src/blake2
+CPPFLAGS+=     -DHAVE_ARGON2 -DARGON2_NO_THREADS
+.PATH.c: ${ARGON2DIR}/src ${ARGON2DIR}/src/blake2
+SRCS+= argon2_utils.c argon2.c core.c encoding.c ref.c blake2b.c
 .endif
 
 .include <bsd.prog.mk>