Module Name: src
Committed By: christos
Date: Mon May 16 10:44:06 UTC 2022
Modified Files:
src/sbin/cgdconfig: Makefile
Log Message:
Re-enable threads; apparently we get different results depending if we are
threaded or not... This tastes like a bug.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sbin/cgdconfig/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/cgdconfig/Makefile
diff -u src/sbin/cgdconfig/Makefile:1.18 src/sbin/cgdconfig/Makefile:1.19
--- src/sbin/cgdconfig/Makefile:1.18 Sun May 15 15:53:27 2022
+++ src/sbin/cgdconfig/Makefile Mon May 16 06:44:06 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2022/05/15 19:53:27 christos Exp $
+# $NetBSD: Makefile,v 1.19 2022/05/16 10:44:06 christos Exp $
RUMPPRG=cgdconfig
MAN= cgdconfig.8
@@ -22,9 +22,11 @@ LDADD= -lutil -lcrypt -ly -ll
.if ${MKARGON2} != "no"
ARGON2DIR= ${NETBSDSRCDIR}/external/apache2/argon2/dist/phc-winner-argon2
CPPFLAGS+= -I${ARGON2DIR}/include -I${ARGON2DIR}/src/blake2
-CPPFLAGS+= -DHAVE_ARGON2 -DARGON2_NO_THREADS
+CPPFLAGS+= -DHAVE_ARGON2
.PATH.c: ${ARGON2DIR}/src ${ARGON2DIR}/src/blake2
-SRCS+= argon2_utils.c argon2.c core.c encoding.c ref.c blake2b.c
+SRCS+= argon2_utils.c argon2.c core.c encoding.c ref.c blake2b.c thread.c
+DPADD+= ${LIBPTHREAD}
+LDADD+= -lpthread
.endif
.include <bsd.prog.mk>