Source-Changes-HG archive

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

[src/trunk]: src/sbin/cgdconfig make things behave just like before the libcr...



details:   https://anonhg.NetBSD.org/src/rev/caf6ac80b421
branches:  trunk
changeset: 366156:caf6ac80b421
user:      christos <christos%NetBSD.org@localhost>
date:      Mon May 16 14:57:44 2022 +0000

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

diffstat:

 sbin/cgdconfig/Makefile |  13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r 239b7fcec549 -r caf6ac80b421 sbin/cgdconfig/Makefile
--- a/sbin/cgdconfig/Makefile   Mon May 16 14:55:56 2022 +0000
+++ b/sbin/cgdconfig/Makefile   Mon May 16 14:57:44 2022 +0000
@@ -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 @@
 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>



Home | Main Index | Thread Index | Old Index