From owner-dev-commits-ports-all@freebsd.org Wed Apr 14 15:41:40 2021 Return-Path: Delivered-To: dev-commits-ports-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 C81BB5DE55E; Wed, 14 Apr 2021 15:41:40 +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 4FL6CS5DFQz3Q96; Wed, 14 Apr 2021 15:41:40 +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 A6AE320853; Wed, 14 Apr 2021 15:41:40 +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 13EFfeRp028688; Wed, 14 Apr 2021 15:41:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13EFfewG028671; Wed, 14 Apr 2021 15:41:40 GMT (envelope-from git) Date: Wed, 14 Apr 2021 15:41:40 GMT Message-Id: <202104141541.13EFfewG028671@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mathieu Arnold Subject: git: 02ccefbf584c - main - Mk: Run apply-slist earlier. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mat X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02ccefbf584c4cb3167ae28f0af57c29bde41ceb Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Apr 2021 15:41:40 -0000 The branch main has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=02ccefbf584c4cb3167ae28f0af57c29bde41ceb commit 02ccefbf584c4cb3167ae28f0af57c29bde41ceb Author: Mathieu Arnold AuthorDate: 2021-04-13 10:52:25 +0000 Commit: Mathieu Arnold CommitDate: 2021-04-14 15:40:56 +0000 Mk: Run apply-slist earlier. This allows SUB_FILES generated files to be available earlier than staging, and use them during the build. --- Mk/bsd.port.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index eaa588c56203..db32745e215c 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -5303,7 +5303,7 @@ _PATCH_SEQ= 050:ask-license 100:patch-message 150:patch-depends \ _CONFIGURE_DEP= patch _CONFIGURE_SEQ= 150:build-depends 151:lib-depends 160:create-binary-alias \ 161:create-binary-wrappers \ - 200:configure-message \ + 200:configure-message 210:apply-slist \ 300:pre-configure 450:pre-configure-script \ 490:run-autotools-fixup 500:do-configure 700:post-configure \ 850:post-configure-script \ @@ -5316,7 +5316,7 @@ _STAGE_DEP= build # STAGE is special in its numbering as it has install and stage, so install is # the main, and stage goes after. _STAGE_SEQ= 050:stage-message 100:stage-dir 150:run-depends \ - 200:apply-slist 300:pre-install \ + 300:pre-install \ 400:generate-plist 450:pre-su-install 475:create-users-groups \ 500:do-install 550:kmod-post-install 600:fixup-lib-pkgconfig 700:post-install \ 750:post-install-script 800:post-stage 850:compress-man \