Module Name: src
Committed By: christos
Date: Mon May 16 14:57:44 UTC 2022
Modified Files:
src/sbin/cgdconfig: Makefile
Log Message:
make things behave just like before the libcrypt symbol renaming:
The normal cgdconfig binary is built with threads and the crunched one
in rescue without.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 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.19 src/sbin/cgdconfig/Makefile:1.20
--- src/sbin/cgdconfig/Makefile:1.19 Mon May 16 06:44:06 2022
+++ src/sbin/cgdconfig/Makefile Mon May 16 10:57:44 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/05/16 10:44:06 christos Exp $
+# $NetBSD: Makefile,v 1.20 2022/05/16 14:57:44 christos Exp $
RUMPPRG=cgdconfig
MAN= cgdconfig.8
@@ -24,9 +24,14 @@ ARGON2DIR= ${NETBSDSRCDIR}/external/apac
CPPFLAGS+= -I${ARGON2DIR}/include -I${ARGON2DIR}/src/blake2
CPPFLAGS+= -DHAVE_ARGON2
.PATH.c: ${ARGON2DIR}/src ${ARGON2DIR}/src/blake2
-SRCS+= argon2_utils.c argon2.c core.c encoding.c ref.c blake2b.c thread.c
-DPADD+= ${LIBPTHREAD}
-LDADD+= -lpthread
+SRCS+= argon2_utils.c argon2.c core.c encoding.c ref.c blake2b.c
+. if defined(CRUNCHEDPROG)
+CPPFLAGS+= -DARGON2_NO_THREADS
+. else
+SRCS+= thread.c
+DPADD+= ${LIBPTHREAD}
+LDADD+= -lpthread
+. endif
.endif
.include <bsd.prog.mk>
