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.
This commit is contained in:
parent
e33af66176
commit
b5df3bed15
|
@ -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/apache2/argon2/dist/phc-winner-argon2
|
|||
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>
|
||||
|
|
Loading…
Reference in New Issue