From owner-svn-src-head@freebsd.org  Mon Mar  6 21:06:56 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 C860DCFC53C;
 Mon,  6 Mar 2017 21:06:56 +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 97EED1EA6;
 Mon,  6 Mar 2017 21:06:56 +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 v26L6tam060384;
 Mon, 6 Mar 2017 21:06:55 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v26L6t2s060383;
 Mon, 6 Mar 2017 21:06:55 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201703062106.v26L6t2s060383@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: Mon, 6 Mar 2017 21:06:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r314794 - head/lib/libmd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Mar 2017 21:06:56 -0000

Author: bdrewery
Date: Mon Mar  6 21:06:55 2017
New Revision: 314794
URL: https://svnweb.freebsd.org/changeset/base/314794

Log:
  Fix bootstrapping libmd on older systems after r314709.
  
  This follows another fix to bootstrap libmd after r313404.  The
  MD5FileChunk prototype is needed to build libmd, but it is
  only reliably in the src tree's sys/md5.h header.  Rather than
  polluting the legacy build with this header for the entire build,
  just symlink it in here for now as is done in the elftoolchain
  build.  Libmd is already referencing other src tree headers by
  its used of CFLAGS+= ${SRCTOP}/sys/crypto/sha2.  This, and
  other uses of CFLAGS+= ${SRCTOP}/sys..., may later change to
  be in the legacy mechanism.
  
  Reported by:	bde, ian, sjg
  Tested by:	ian

Modified:
  head/lib/libmd/Makefile

Modified: head/lib/libmd/Makefile
==============================================================================
--- head/lib/libmd/Makefile	Mon Mar  6 20:54:21 2017	(r314793)
+++ head/lib/libmd/Makefile	Mon Mar  6 21:06:55 2017	(r314794)
@@ -72,6 +72,13 @@ CLEANFILES+=	md[245]hl.c md[245].ref md[
 		skein256.ref skein512.ref skein1024.ref \
 		skeindriver
 
+# Need src tree sys/md5.h for MD5FileChunk prototype on older systems.
+SRCS+=		sys/md5.h
+CLEANDIRS=	sys
+CFLAGS+=	-I.
+sys/md5.h: ${SRCTOP}/sys/${.TARGET} .NOMETA
+	ln -sf ${.ALLSRC} ${.TARGET}
+
 # Define WEAK_REFS to provide weak aliases for libmd symbols
 #
 # Note that the same sources are also used internally by libcrypt,