git: c4290130df8b - stable/13 - Makefile.inc1: Bootstrap libcrypt on non-FreeBSD for libroken

From: Jessica Clarke <jrtc27_at_FreeBSD.org>
Date: Tue, 25 Jan 2022 01:40:05 UTC
The branch stable/13 has been updated by jrtc27:

URL: https://cgit.FreeBSD.org/src/commit/?id=c4290130df8bb22c39e2b825a838fb488c639303

commit c4290130df8bb22c39e2b825a838fb488c639303
Author:     Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2021-12-06 23:00:31 +0000
Commit:     Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2022-01-24 23:59:26 +0000

    Makefile.inc1: Bootstrap libcrypt on non-FreeBSD for libroken
    
    After f0a6ab51e6da, we need libroken's dependencies to be present; in
    particular, libcrypt is not present on macOS, and so needs to be
    bootstrapped. We include this on Linux too for consistency and to avoid
    future compatibility issues, even if strictly unnecessary currently.
    
    Fixes:          f0a6ab51e6da ("src.libnames.mk: Include dependencies when bootstrapping from non-FreeBSD"
    MFC after:      1 week
    
    (cherry picked from commit 8f7eb330f7a4c7454d7eb6586a5f86091321382b)
---
 Makefile.inc1 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 98caae210c85..d50df2a12c80 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2463,6 +2463,10 @@ ${_bt}-usr.bin/grep: ${_bt}-lib/libbz2
 # libdwarf depends on libz
 _other_bootstrap_tools+=lib/libz
 ${_bt}-lib/libdwarf: ${_bt}-lib/libz
+
+# libroken depends on libcrypt
+_other_bootstrap_tools+=lib/libcrypt
+${_bt}-lib/libroken: ${_bt}-lib/libcrypt
 .else
 # All tools in _basic_bootstrap_tools have the same name as the subdirectory
 # so we can use :T to get the name of the symlinks that we need to create.