From c2a55defd7b07da3c5e56aa4c4dceee3467432ae Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Wed, 25 Nov 2015 19:45:04 +0000 Subject: [PATCH] META MODE: Avoid dirdep dependency on lib/libmd. This avoids using the staged headers for sys/crypto/sha2/*.h, such as sha256.h, which added an unneeded pre-build dependency on libmd to libcrypt. This header is an INCS in lib/libmd, but found via .PATH in sys/crypto/sha2. Since the libcrypt build was already using the in-src libmd headers directly, just teach it how to find the sha256.h header as well. Sponsored by: EMC / Isilon Storage Division --- lib/libcrypt/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile index 85bf94804fca..70c46342b3a6 100644 --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -17,7 +17,8 @@ SRCS= crypt.c misc.c \ crypt-sha512.c sha512c.c MAN= crypt.3 MLINKS= crypt.3 crypt_get_format.3 crypt.3 crypt_set_format.3 -CFLAGS+= -I${.CURDIR}/../libmd -I${.CURDIR}/../libutil +CFLAGS+= -I${.CURDIR}/../libmd -I${.CURDIR}/../libutil \ + -I${.CURDIR}/../../sys/crypto/sha2 # Pull in the strong crypto, if it is present. .if exists(${.CURDIR}/../../secure/lib/libcrypt) && ${MK_CRYPT} != "no"