From owner-svn-src-all@freebsd.org Wed Mar 22 17:56:48 2017
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 7345ED17038;
Wed, 22 Mar 2017 17:56:48 +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 294E11E44;
Wed, 22 Mar 2017 17:56:48 +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 v2MHulRq032209;
Wed, 22 Mar 2017 17:56:47 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2MHulhV032207;
Wed, 22 Mar 2017 17:56:47 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201703221756.v2MHulhV032207@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, 22 Mar 2017 17:56:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r315724 - in stable/11: . lib/libmd
X-SVN-Group: stable-11
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.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <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, 22 Mar 2017 17:56:48 -0000
Author: bdrewery
Date: Wed Mar 22 17:56:46 2017
New Revision: 315724
URL: https://svnweb.freebsd.org/changeset/base/315724
Log:
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
Modified:
stable/11/Makefile.inc1
stable/11/lib/libmd/Makefile
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/Makefile.inc1
==============================================================================
--- stable/11/Makefile.inc1 Wed Mar 22 17:53:25 2017 (r315723)
+++ stable/11/Makefile.inc1 Wed Mar 22 17:56:46 2017 (r315724)
@@ -1583,10 +1583,14 @@ ${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd
${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4
.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} < 1100093
+_nmtree= lib/libmd \
+ lib/libnetbsd \
usr.sbin/nmtree
+${_bt}-lib/libnetbsd: ${_bt}-lib/libmd
${_bt}-usr.sbin/nmtree: ${_bt}-lib/libnetbsd
.endif
Modified: stable/11/lib/libmd/Makefile
==============================================================================
--- stable/11/lib/libmd/Makefile Wed Mar 22 17:53:25 2017 (r315723)
+++ stable/11/lib/libmd/Makefile Wed Mar 22 17:56:46 2017 (r315724)
@@ -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,