From 5d0269d6147477882159728639194180da1db010 Mon Sep 17 00:00:00 2001
From: bdrewery <bdrewery@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Wed, 22 Mar 2017 18:35:48 +0000
Subject: [PATCH] MFC r314709,r314790,r314794:

  r314709:
    Fix bootstrapping mtree after r313404 for older systems.
  r314790:
    Added comments for why nmtree/libmd are bootstrapped.
  r314794:
    Fix bootstrapping libmd on older systems after r314709.

PR:		217673


git-svn-id: svn://svn.freebsd.org/base/stable/10@315731 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 Makefile.inc1      | 8 ++++++--
 lib/libmd/Makefile | 7 +++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index a9f6c0e14..04466b512 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1323,10 +1323,14 @@ ${_bt}-usr.bin/yacc: ${_bt}-lib/liby
 _crunch=	usr.sbin/crunch
 .endif
 
-.if ${BOOTSTRAPPING} < 1000026
-_nmtree=	lib/libnetbsd \
+# r245440 mtree -N support added
+# r313404 requires sha384.h for libnetbsd, added to libmd in r292782
+.if ${BOOTSTRAPPING} < 1003512
+_nmtree=	lib/libmd \
+		lib/libnetbsd \
 		usr.sbin/nmtree
 
+${_bt}-lib/libnetbsd: ${_bt}-lib/libmd
 ${_bt}-usr.sbin/nmtree: ${_bt}-lib/libnetbsd
 .endif
 
diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile
index 011a2e711..f097a4b61 100644
--- a/lib/libmd/Makefile
+++ b/lib/libmd/Makefile
@@ -52,6 +52,13 @@ CLEANFILES+=	md[245]hl.c md[245].ref md[245].3 mddriver \
 		sha256.ref sha256hl.c sha384hl.c sha384.ref \
 		sha512.ref sha512hl.c sha512t256.ref sha512thl.c
 
+# Need src tree sys/md5.h for MD5FileChunk prototype on older systems.
+SRCS+=		sys/md5.h
+CLEANDIRS=	sys
+CFLAGS+=	-I.
+sys/md5.h: ${.CURDIR}/../../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,
-- 
2.45.0