From nobody Sat Mar 23 17:47:36 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 4V26950n4rz5FWvM; Sat, 23 Mar 2024 17:47:37 +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 4V269506d6z41ZC; Sat, 23 Mar 2024 17:47:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711216057; 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=J4RjlKLbSJRRrEs03572RVJRmfGs9UXZHqPprwFjk+g=; b=jMscHcQ4u9Ifufi9p/tx+OkJQX9xMC2/pjvy0uwSgX0rjLOeNBkNZR4lr2B5irt/y7TUgk 46i8wwXZ07k1aBQARS0l8FL8dtPOexbkDRUjUlEFO7pfCDSKB3Gqf69yNZDXi6vnLdXtM7 1nUeRdVWU/bxVBzHp5Q1SvZlGuszR8Ej7LsHzhSYI1sZSQIS9YzhvHjqNzKCpb5MNNh2SL BYH9rdirTGBdE8LxcVbzcZuIATdJAD/prbFyTKERlL8VppE5xGfTEJgj1pGGY2Jy3fZ0Fp Cholc4X6yJ+ydAe/KK4t2hVLW5x8EFmFkxWPQAxGczPvl7COePWIsr6pIgpXNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711216057; a=rsa-sha256; cv=none; b=PMLbjpX8AK6fKHiu7S2C1+UtPOz5tHlgT1hfMlbDX5YAyDuJIswFaR9yWSjymrayouH4by WDHmfIPMh41nXpj1Purw21KKoNPYvGmg1cdQR7VBme/qtdIR1U65EwgmaXjdJ6D+8ZDelm 9UsnA0kpfvwzP87HJn9oOzB+RWnlNwksW2/J+w6Ilj6hhnj3UUbua7+6/kWjvHJZvJbbuU 0FsGc3PlQV5LwkoDu8uuUsscwfT/7WIfm61gTwujD0muOBg4BiBQ2DYTRXdCLXDWwf/PRY 7BcaipXqt/hgYDnAezuTMGQzTo+sRWQ7hqqNhJ3/kaYMXXyQkcMQ0PuP+Galnw== 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=1711216057; 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=J4RjlKLbSJRRrEs03572RVJRmfGs9UXZHqPprwFjk+g=; b=nlj+I9Qvm1JQVKzTwQ5qwesqXR6jQGh7eHnuNuhk2AWgzi5oZ1WPOgrtLn1+WQpOwwgHBz C1AGFkHRlKJ9BVbQEiuYpAvKMW0xxmBKLz5kAuO/eTM2WlpepAcTrwlQcZVnrcPwErlSgc z3HOP0mz4DLogROeevSfx/i3PppZ2VPy4CmjtGuL/c1cbHtSq/HgAEgN3xCNhkzvt4H8et X0IUCG/9165YTv+5qjBDal5WyCra+xYxw2iho0QMSCL5gJLG0VD6A6ppPMra0+hQvRF9zq MKUnz4CUG1S3GbmdGZYXVneV/5RrKfp4pa/B6qansFke/IHi00r9HJG/aSxgDw== 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 4V26946mzqzy6f; Sat, 23 Mar 2024 17:47:36 +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 42NHlavW091097; Sat, 23 Mar 2024 17:47:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42NHlaRh091094; Sat, 23 Mar 2024 17:47:36 GMT (envelope-from git) Date: Sat, 23 Mar 2024 17:47:36 GMT Message-Id: <202403231747.42NHlaRh091094@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tijl Coosemans Subject: git: cc9c37d73947 - main - */*: Always use WRK_ENV with 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tijl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc9c37d73947e0184f66f0b5fa3fc021f7fdf51c Auto-Submitted: auto-generated The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=cc9c37d73947e0184f66f0b5fa3fc021f7fdf51c commit cc9c37d73947e0184f66f0b5fa3fc021f7fdf51c Author: Tijl Coosemans AuthorDate: 2024-03-23 17:35:13 +0000 Commit: Tijl Coosemans CommitDate: 2024-03-23 17:45:45 +0000 */*: Always use WRK_ENV with SETENVI WRK_ENV contains environment variables like OSVERSION and UNAME_* that are needed when cross-building packages using Poudriere for a different version of FreeBSD or a different architecture than that of the host system. --- devel/libpci/Makefile | 2 +- devel/redo/Makefile | 2 +- devel/tinycbor/Makefile | 2 +- science/cdo/Makefile | 2 +- textproc/translate-toolkit/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devel/libpci/Makefile b/devel/libpci/Makefile index 358d235ce21d..8cc09e70074a 100644 --- a/devel/libpci/Makefile +++ b/devel/libpci/Makefile @@ -36,7 +36,7 @@ post-patch: @${LN} -s . ${WRKSRC}/lib/pci do-configure: - @cd ${WRKSRC}/ && ${SETENVI} ${MAKE_ENV} ${MAKE_CMD} lib/config.h + @cd ${WRKSRC}/ && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} lib/config.h post-build: @cd ${WRKSRC}/lib/ && ${CC} ${CFLAGS} ${STRIP} -Wl,-soname=libpci.so.3 -shared *.o -lz -o libpci.so.3 diff --git a/devel/redo/Makefile b/devel/redo/Makefile index 2877292d46d6..f3ea4f5efb25 100644 --- a/devel/redo/Makefile +++ b/devel/redo/Makefile @@ -30,7 +30,7 @@ do-configure: @${ECHO_CMD} '${LDFLAGS}' > ${WRKSRC}/build/ldflags do-build: - @cd ${WRKSRC} && ${SETENVI} ${MAKE_ENV} ./package/make + @cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ./package/make do-install: cd ${WRKSRC} && ./package/makeinstall diff --git a/devel/tinycbor/Makefile b/devel/tinycbor/Makefile index 2ebd07ac91d3..6319f1472ee5 100644 --- a/devel/tinycbor/Makefile +++ b/devel/tinycbor/Makefile @@ -23,7 +23,7 @@ GH_ACCOUNT= intel USE_GITHUB= yes do-configure: - @cd ${WRKSRC}/ && ${SETENVI} ${MAKE_ENV} ${MAKE_CMD} configure + @cd ${WRKSRC}/ && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} configure post-install: ${LN} -fs libtinycbor.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libtinycbor.so diff --git a/science/cdo/Makefile b/science/cdo/Makefile index ba3f6d3865b1..3e0140edccfc 100644 --- a/science/cdo/Makefile +++ b/science/cdo/Makefile @@ -70,6 +70,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/libcdi/src/cdi.inc ${STAGEDIR}${PREFIX}/include/cdi.inc test-NETCDF-on: - @cd ${WRKSRC}/ && ${SETENVI} CDO_PATH=src/cdo src/cdotest + @cd ${WRKSRC}/ && ${SETENVI} ${WRK_ENV} CDO_PATH=src/cdo src/cdotest .include diff --git a/textproc/translate-toolkit/Makefile b/textproc/translate-toolkit/Makefile index f185e96effec..1398b9b34dca 100644 --- a/textproc/translate-toolkit/Makefile +++ b/textproc/translate-toolkit/Makefile @@ -77,7 +77,7 @@ YAML_VARS= MANPAGES+="po2yaml yaml2po" post-build: @${MKDIR} ${WRKSRC}/manpages .for manpage in ${MANPAGES} - cd ${WRKSRC}/build/lib/translate/convert && ${SETENVI} PYTHONPATH=${WRKSRC}/build/lib ${PYTHON_CMD} ${manpage}.py --man > ${WRKSRC}/manpages/${manpage}.1 + cd ${WRKSRC}/build/lib/translate/convert && ${SETENVI} ${WRK_ENV} PYTHONPATH=${WRKSRC}/build/lib ${PYTHON_CMD} ${manpage}.py --man > ${WRKSRC}/manpages/${manpage}.1 .endfor post-install: