From nobody Wed Sep 25 06:30:02 2024 X-Original-To: dev-commits-ports-main@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 4XD6KR2d74z5Wh0G; Wed, 25 Sep 2024 06:30:03 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XD6KR11qTz485H; Wed, 25 Sep 2024 06:30:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727245803; 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=kmoGzy0xePGjve8YwIUQpb5pvvIT19E5kZSN/8SugP8=; b=LbPMmGQKIMmfE5EPMgIlQOaAXPhLvP7LiMnp1rx98ZoAC0TJIMa+OywJZWfnhjSPbvGl9X p7zX7RjaNaIRVzQjAOZwEs5CVbc81qbOdBmybpzPOi5qKWdoPntNO1JT4Bnfxn4ITHGQ0T 0RZNlsfPotv+p4M0f5EK5omfvjZhwPcuXUkNAxTRMak57ucf+GQsKS2ej5ph0cNEM7s3Nc C8A6vN/LBkd/UB8mAHveFvVuQ+JrgMLNs2m1kk4JW2qko1g7y522B/5sUDIufkaAPY9vRL OI1laNV2And2jDRfup63bP2sKX4bF0t8yHD1GnH1Zj3QXF7YxnIDeT6HDaQT5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727245803; a=rsa-sha256; cv=none; b=QoztWdmTrRmkSkMhSOjWYQNzIu7PapmfenR4Da5gLhaL0Ay1rnA9DgB7gQIANlO52IRpnp RFgolFHUtGh5VZwJRKGEOi+TDxojqk2xPVmTPTHpjZUFpj16hMj35SCDzC4Bngt9Mbeu3E RX/bv2HnrgRTDnjyZONrDVZ4SIExGcFHXJf4BUnWWIWKK8EyOhZrstfyefOQr/yXlssIr+ 3SCAgJbjWVH+mTYE49rxQBldBXy2ODxdGH5+cc60d4nyFWIxRk6yf4sXL+OFu9TjhdqTq5 bCqww84vSn1kwFlCXHKnAD3IoZ5J1NLpxm5nxNSCdXNSbGrQ41wbkyD8kpML0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727245803; 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=kmoGzy0xePGjve8YwIUQpb5pvvIT19E5kZSN/8SugP8=; b=XtCN6ijR2AOO6Zj041P1++WSQo8Uem+vJCKNFlEaDkH7vAigBY3PftcXYRN2QvqLs8Ilr8 +5c4CBXLU5zSy0lHmnK+XWssk65ii1H6U3uNveg4QtmwYM33N06MFL8NYpkOcLwD4SDiot lDcqegjE2nqUeV0qgL4e5SmLbrw+WqZ8CmOevfzjDkIHrcrqEdJZkeBm9O12OKoO4qnJfN /xeSodnXq9nxNsq2uUmI0+o0MN6KZVngHSRJzfc4x6Ha62tfOWnS2Hhzp8yoQ866gDWl3M htknUw6NX3WUxUb7Ym1aSvyB8f/DKa/KJSWDf58OYyDCkfqC39VGtStcJVJcrA== 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 4XD6KR0fNPz125Q; Wed, 25 Sep 2024 06:30:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48P6U27E045887; Wed, 25 Sep 2024 06:30:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48P6U2DX045882; Wed, 25 Sep 2024 06:30:02 GMT (envelope-from git) Date: Wed, 25 Sep 2024 06:30:02 GMT Message-Id: <202409250630.48P6U2DX045882@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 74f60cecc5f6 - main - devel/build2: use SETENVI List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74f60cecc5f6ee5421694d92dc8cd10936911095 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=74f60cecc5f6ee5421694d92dc8cd10936911095 commit 74f60cecc5f6ee5421694d92dc8cd10936911095 Author: Robert Clausecker AuthorDate: 2024-09-20 14:16:59 +0000 Commit: Robert Clausecker CommitDate: 2024-09-25 06:28:02 +0000 devel/build2: use SETENVI Apparently this is needed when building with portmaster. PR: 281554 Reported by: O. Hartmann Event: EuroBSDcon 2024 --- devel/build2/Makefile | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/devel/build2/Makefile b/devel/build2/Makefile index 7362c764a0e8..f25d04389f2b 100644 --- a/devel/build2/Makefile +++ b/devel/build2/Makefile @@ -1,5 +1,6 @@ PORTNAME= build2 DISTVERSION= 0.17.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://download.build2.org/${DISTVERSION}/ DISTNAME= build2-toolchain-${DISTVERSION} @@ -30,11 +31,13 @@ OPTIONS_DEFINE= DOCS pre-build: # phase 1 - @cd ${WRKSRC}/build2 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} bootstrap.gmake ${_MAKE_JOBS} + @cd ${WRKSRC}/build2 && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \ + ${MAKE_CMD} ${MAKE_FLAGS} bootstrap.gmake ${_MAKE_JOBS} do-build: # phase 2 - @cd ${WRKSRC}/build2 && ${SETENV} ${MAKE_ENV} ./build2/b-boot \ + @cd ${WRKSRC}/build2 && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \ + ./build2/b-boot \ config.cxx=${CXX} \ config.cxx.coptions="${CXXFLAGS}" \ config.cxx.loptions="${LDFLAGS} -s" \ @@ -45,7 +48,8 @@ do-build: do-install: # "stage" (local installation) - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build2/build2/b-boot configure \ + @cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \ + ./build2/build2/b-boot configure \ config.cxx=${CXX} \ config.cxx.coptions="${CXXFLAGS}" \ config.cxx.loptions="${LDFLAGS} -s" \ @@ -54,9 +58,11 @@ do-install: config.bin.rpath=${PREFIX}/lib \ config.install.chroot=${STAGEDIR} \ config.install.root=${PREFIX} - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build2/build2/b-boot install: build2/ bpkg/ bdep/ \ + @cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \ + ./build2/build2/b-boot install: build2/ bpkg/ bdep/ \ -V -j ${MAKE_JOBS_NUMBER} -J ${MAKE_JOBS_NUMBER} - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build2/build2/b-boot install: '!config.install.scope=project' libbuild2-*/ \ + @cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \ + ./build2/build2/b-boot install: '!config.install.scope=project' libbuild2-*/ \ -V -j ${MAKE_JOBS_NUMBER} -J ${MAKE_JOBS_NUMBER} .include