From nobody Sat May 11 07:09:28 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 4Vbxh92QZsz5JJ5j; Sat, 11 May 2024 07:09:29 +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 4Vbxh91sbwz4Ftk; Sat, 11 May 2024 07:09:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715411369; 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=wDm9g0TC7fQuLBt4O59g+LM0oWSL4eaHbpv54VFkW00=; b=BtPdzLCZExOE0+ozfRxC/OjP5ANd6Vi092a0f5PGiQ77gLEcpGSVpaxnniY2mgVXRveH0i kmj6bJzA7UdorKN2h4bH1PJiSYV3q+qh5q7gf7fRmqZmUrQkRX12L0UAWvf8Z2UQ18AJOX AziSt9Eg7tMnmX6lUxqLlqTIEFrTn7unBHxkeegHVy8eTTE6s4S6I9s3HypaotHNtN69sE IRxNGZyAQW7pJiDTfzXlHpoSHNZwavb+v/Zi4/Ca62/xv0pwhu7ZQ8Gt2RuVFHmGQ0R/ZM yFNWCK4gofKdew+9Jze9UG2BLv21DDJwCTIEBo0/6m7+Y1lALp3IPaA2+C21Sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715411369; a=rsa-sha256; cv=none; b=t6gHhNpz8naKds/MBYx9th3tPcNmi8Bw2/wtqSUfM3BaMTwgIFbB7aqZ14ZHCrzfDCIXxJ q/LZaG4ieR9lECHoyq/rUml7M5HpnpzUIpBDaDdPwSWBpD+GBk3hwdCEfMJprZkjpnW+b6 l4Jk8ck4nYdS/Kfw3v+5xoHlYIPRPcUy6yh8oca2m6HOh9JC2ZfzA+iToHx5bbSgzyVbp9 QhRsO1bLqi+X3TcifILG6SVjcNGi7eqcGWwfRX0kG9W46i9/SA6WFkS2aunpYV37zr6m98 pCJWcwNA9ytFLc2BQLHj4YQnBqUzKxgJPyZSJ3ba92W1i686S7YOlyJaam9exA== 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=1715411369; 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=wDm9g0TC7fQuLBt4O59g+LM0oWSL4eaHbpv54VFkW00=; b=DOIP5DPM5e0XIUNG4B1KQmA+6yfnc4dwanYDTdq1TQHByBAaTaDU/yJscctobrlzqlJkQj 1J7umGhOEqtCYWL5YSUJCfAPN6HwAojFK/SzPIldT2wXn0GPpWDrulRLuLi5v8rKJFMRRE RPnmrmcPTiiHPsqI4vZq2sjWmehU/YR1R158ceHGAcnEhn9Y/qXBzwvdIzdObZLSNDwR1u u2IF17d3nmqI70YsreT6EQy0A6alyvWUUJlCAiOGQmU7JArzkvwDhB882ZIq9Ky4fR1lTs ePkpBkTJmrjDRFJUYSoQE0m3VqqVIacThk5NYuN77rH/SZ6kHK3qX14ADEmh/Q== 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 4Vbxh90jzvz19py; Sat, 11 May 2024 07:09:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44B79SIl079357; Sat, 11 May 2024 07:09:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44B79SsU079354; Sat, 11 May 2024 07:09:28 GMT (envelope-from git) Date: Sat, 11 May 2024 07:09:28 GMT Message-Id: <202405110709.44B79SsU079354@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Palle Girgensohn Subject: git: 43c0fa7a8f88 - main - postgresql??-*: Build with a clean environment 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: girgen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43c0fa7a8f885172bf58c9af743b1aaab8237cf8 Auto-Submitted: auto-generated The branch main has been updated by girgen: URL: https://cgit.FreeBSD.org/ports/commit/?id=43c0fa7a8f885172bf58c9af743b1aaab8237cf8 commit 43c0fa7a8f885172bf58c9af743b1aaab8237cf8 Author: Palle Girgensohn AuthorDate: 2024-05-11 07:04:16 +0000 Commit: Palle Girgensohn CommitDate: 2024-05-11 07:09:05 +0000 postgresql??-*: Build with a clean environment The fix in 572f236169264, PR 276478, suggest a change SETENV->SETENVI. Implement this for the PostgreSQL builds. This should fix builds problems for some when building using portmaster. PR: 278889 Reported by: O. Hartmann --- databases/postgresql16-server/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/databases/postgresql16-server/Makefile b/databases/postgresql16-server/Makefile index 2adc5a60ec4a..c73f0d255be9 100644 --- a/databases/postgresql16-server/Makefile +++ b/databases/postgresql16-server/Makefile @@ -233,9 +233,9 @@ pre-build: .if !defined(NO_BUILD) && !target(do-build) do-build: - @ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} generated-headers + @ cd ${WRKSRC}/src/backend && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} generated-headers @ for dir in ${BUILD_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ; \ + cd ${WRKSRC}/$${dir} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ; \ done . if exists(${FILESDIR}/pkg-message${COMPONENT}.in) @@ -256,7 +256,7 @@ post-patch: do-install: @for dir in ${INSTALL_DIRS}; do \ cd ${WRKSRC}/$${dir} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \ + ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \ done . if defined(SERVER_ONLY) @ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\ @@ -265,7 +265,7 @@ do-install: ${STAGEDIR}${PREFIX}/etc/periodic/daily . endif # SERVER_ONLY . if defined(CLIENT_ONLY) - @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local + @ cd ${WRKSRC}/src && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local . endif @ if [ -r ${PKGMESSAGE} ]; then \ ${MKDIR} ${STAGEDIR}${DOCSDIR} ;\