From owner-svn-src-all@freebsd.org  Wed Nov 25 19:45:06 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 45F87A37869;
 Wed, 25 Nov 2015 19:45:06 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 09A871052;
 Wed, 25 Nov 2015 19:45:05 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAPJj55W004229;
 Wed, 25 Nov 2015 19:45:05 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAPJj5nX004228;
 Wed, 25 Nov 2015 19:45:05 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201511251945.tAPJj5nX004228@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 25 Nov 2015 19:45:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r291325 - head/lib/libcrypt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Nov 2015 19:45:06 -0000

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"