From owner-dev-commits-src-all@freebsd.org Mon Jul 12 19:55:19 2021 Return-Path: Delivered-To: dev-commits-src-all@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 F05DF665DEC; Mon, 12 Jul 2021 19:55:19 +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 4GNvd36Whkz3lHQ; Mon, 12 Jul 2021 19:55:19 +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 B5C2C15193; Mon, 12 Jul 2021 19:55:19 +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 16CJtJKv043944; Mon, 12 Jul 2021 19:55:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16CJtJmY043943; Mon, 12 Jul 2021 19:55:19 GMT (envelope-from git) Date: Mon, 12 Jul 2021 19:55:19 GMT Message-Id: <202107121955.16CJtJmY043943@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 8b487b8292e4 - main - Fix bsd.subdir.mk-related issues after 0a0f7486413c 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/main X-Git-Reftype: branch X-Git-Commit: 8b487b8292e4ab0b18998055b64235c4cc3ab771 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jul 2021 19:55:20 -0000 The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=8b487b8292e4ab0b18998055b64235c4cc3ab771 commit 8b487b8292e4ab0b18998055b64235c4cc3ab771 Author: Jessica Clarke AuthorDate: 2021-07-12 19:54:01 +0000 Commit: Jessica Clarke CommitDate: 2021-07-12 19:54:01 +0000 Fix bsd.subdir.mk-related issues after 0a0f7486413c Since bsd.prog.mk includes bsd.obj.mk, and thus bsd.subdir.mk, we must ensure all our bsd.subdir.mk-affecting variables are set before including bsd.prog.mk. Since sbin's various Makefile.arch files add to SUBDIR this results in those not taking effect, and presumably we also end up not having buildworld as parallel as it should be due to the fact that SUBDIR_PARALLEL was not being set before including bsd.prog.mk. MFC with: 0a0f7486413c147d56808b38055c40c64cff61f5 Reviewed by: olivier Differential Revision: https://reviews.freebsd.org/D31125 --- sbin/Makefile | 8 ++++---- usr.sbin/Makefile | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sbin/Makefile b/sbin/Makefile index f53e2f037ebe..6d6b647651ad 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -90,14 +90,14 @@ SUBDIR.${MK_ZFS}+= zfsbootcfg SUBDIR.${MK_TESTS}+= tests +.include + +SUBDIR_PARALLEL= + # Add architecture-specific manpages # to be included anyway MAN= sconfig/sconfig.8 .include -.include - -SUBDIR_PARALLEL= - .include diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index a5d2a476538f..f0614ba9b348 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -213,6 +213,8 @@ SUBDIR.${MK_TESTS}+= tests .include +SUBDIR_PARALLEL= + # Add architecture-specific manpages # to be included anyway MAN= apmd/apmd.8 \ @@ -220,6 +222,4 @@ MAN= apmd/apmd.8 \ .include -SUBDIR_PARALLEL= - .include