From nobody Tue Jan 25 01:40:05 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 549D8197283E; Tue, 25 Jan 2022 01:40:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JjV0P4Mfzz4ZkR; Tue, 25 Jan 2022 01:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DagnQhFMwqccFSkj5/0jfYXmZ6EIKIIYYzdAhl8OD0I=; b=Xuh3/zgTwJ8/Sp8Ikq7EZzVfp/4dCkpj6OzQzs+8S2GNGHyqDLQiQFOUllLWTwVI8xREsr PuJ4GNBriJoQOUVqlFu8I3EGWEWAbokZIAEAWT+amT8CDuSTAUslX6Fg/LSuy+NJb4glu1 wAf07TeigpUt7pwXDeWzdXRXcBVMFoJs5oPY6DbVhh8JDPq0mVSaWeNtPZUEvc1aHQAtiw CMhXzSdKJD/RmJHyOiG2Fcc4ibIW5ors1R9szDxyZtzH3c0HTik2q+OpDFRGTkHDnUKTzb ZI0G0oJxIx8JiAtYyrBX2dXV/slfEHL/FvkTdxLtHFeHltXCQW/O7pBNP4K/yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3469520C75; Tue, 25 Jan 2022 01:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20P1e5O1045348; Tue, 25 Jan 2022 01:40:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20P1e5MP045345; Tue, 25 Jan 2022 01:40:05 GMT (envelope-from git) Date: Tue, 25 Jan 2022 01:40:05 GMT Message-Id: <202201250140.20P1e5MP045345@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: c4290130df8b - stable/13 - Makefile.inc1: Bootstrap libcrypt on non-FreeBSD for libroken List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c4290130df8bb22c39e2b825a838fb488c639303 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DagnQhFMwqccFSkj5/0jfYXmZ6EIKIIYYzdAhl8OD0I=; b=T/W4nWrGOXFtCXexeQ4zwHm8NUQD8LwGxgQHPASxaSln5sevihhebWfZxktda6Tx5eM7CR gsOtj3EnaZ9r6G7usakcHTLY0tLCeK0raN+Xfy3pHZ+gWnCAuCm94X4Mzh8s3oIOxkIJ8b 5nuQwg5AYlbtgelmvy5dBP/GQWXbsngSvpW+gNvQFv809w8wxqG7y4hOfDLyqj8npK8Svh RjrD0IfNET/hLppyo6au4aquepfVTO/DloNy3rIcVAN5JTMaaqJ343dsDHrHLD6epMnWpU nVIAo0WUBuqJtRXZPp5suLJqAhSY5Pu99lgMMgGwUNKFtVjVmWj3bBbF82ymHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643074806; a=rsa-sha256; cv=none; b=V2ar0xRw0yO/EgzrpDlbtXt2/R7NViTkZ7TQIPvcLgAZ9wAFISIwqm/gzlCp07ok0vpfk0 VXGIb7VZa8rI2VYc1AYNLmPqFmL2Ab7ZM1YheZOAsmcdCtpV27pjvRt1bEKqZOzkqW8FvO EP8yUYgoDmvYyDoBbZet9A/r8hplMS2nSAA+GNW5lAuVWlGu7fHvprRBqGnIN6D0hO5hy7 c+XmkWI2mkoWYO5isiBlQo1MIfsaXCVGC+o/2BR82zkg3pXsHjWohK1es+Idvmx0Bk9lRM WV467j1jghNq1iS3XTuMGrsq7HbUvHH5nGP50LasPF3MQBhZatmPq6qamB/tCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=c4290130df8bb22c39e2b825a838fb488c639303 commit c4290130df8bb22c39e2b825a838fb488c639303 Author: Jessica Clarke AuthorDate: 2021-12-06 23:00:31 +0000 Commit: Jessica Clarke 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.