From owner-dev-commits-src-main@freebsd.org Thu Jan 7 22:28:21 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EB3A14DD371; Thu, 7 Jan 2021 22:28:21 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DBgqT6MYHz3vvf; Thu, 7 Jan 2021 22:28:21 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C9529189E9; Thu, 7 Jan 2021 22:28:21 +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 107MSLw0089302; Thu, 7 Jan 2021 22:28:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 107MSLCM089301; Thu, 7 Jan 2021 22:28:21 GMT (envelope-from git) Date: Thu, 7 Jan 2021 22:28:21 GMT Message-Id: <202101072228.107MSLCM089301@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: e41367e3ae12 - main - stand: avoid adding fdt SUBDIR_DEPEND if WITHOUT_FDT is set MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e41367e3ae1246c2b086f9f920a175108aa72380 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jan 2021 22:28:22 -0000 The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e41367e3ae1246c2b086f9f920a175108aa72380 commit e41367e3ae1246c2b086f9f920a175108aa72380 Author: Kyle Evans AuthorDate: 2021-01-07 21:59:38 +0000 Commit: Kyle Evans CommitDate: 2021-01-07 22:28:20 +0000 stand: avoid adding fdt SUBDIR_DEPEND if WITHOUT_FDT is set This unbreaks the efi build if WITHOUT_FDT is set. Reported by: peterj --- stand/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stand/Makefile b/stand/Makefile index 7b871d9164db..f08386424009 100644 --- a/stand/Makefile +++ b/stand/Makefile @@ -78,7 +78,9 @@ SUBDIR_DEPEND_libsa32+= libsa SUBDIR_DEPEND_forth+= ficl SUBDIR_DEPEND_lua+= liblua +.if ${MK_FDT} != "no" SUBDIR_DEPEND_efi+= fdt +.endif SUBDIR_PARALLEL= yes