svn commit: r291325 - head/lib/libcrypt

Bryan Drewery bdrewery at FreeBSD.org
Wed Nov 25 19:45:06 UTC 2015


Author: bdrewery
Date: Wed Nov 25 19:45:04 2015
New Revision: 291325
URL: https://svnweb.freebsd.org/changeset/base/291325

Log:
  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

Modified:
  head/lib/libcrypt/Makefile

Modified: head/lib/libcrypt/Makefile
==============================================================================
--- head/lib/libcrypt/Makefile	Wed Nov 25 19:45:01 2015	(r291324)
+++ head/lib/libcrypt/Makefile	Wed Nov 25 19:45:04 2015	(r291325)
@@ -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"


More information about the svn-src-all mailing list