From nobody Thu Mar 28 11:42:14 2024 X-Original-To: dev-commits-ports-all@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 4V51qC0nggz5Fgsm; Thu, 28 Mar 2024 11:42:15 +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 4V51qB6jzNz4QWd; Thu, 28 Mar 2024 11:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711626134; 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=B+a0g7L6942jRFbafx+x185MYR+NWRwxQWGHTVOpo1w=; b=a/nCzuDjoRhCSgG/neaQTd54vDcCNvigPnDQyRC0N6IYkrBFl2e+LZzPS+OqyFciDJGbuH mno4nKOm0lthXwY9h0ZErVAGMiNoThau5T4JJMWSYmeN+SNWZKAfNxnxSDAPl33HtmEaSh GVE0sgLrcHV4gV53uFwBC0EGVrBeZLD43+5lbwFT56ZR5BnPZYlKKEYnEqRGbyDRW2l1hR slVzEg2tfTdn9NTXvRzaXUKPcecH1cnWC2bKdKyR108aE9GjrHLYvXY7PKqUMaoX0AZ8GX NQLZVmF09CSnnZr9B3PrCnbtG8HasMRFZTF+K37BpmkVyGlWqV5FkvIto3Dcog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711626134; a=rsa-sha256; cv=none; b=yltU2KktbeZ82cZu5YAqVXVe7u+2MoSs5EFHVgN7b62x3b7gEgmKqFXfVIuV8Io2QC7anl 1kUulQuR/3WaGrIzLIfCaVHer5YL+POGP2nBdEyESyW4YpO8mNIR/cC/HpqUvLhFjeGDXP CjVMDFqnHOTBbJeCQJenxAyo2dfwJ3pcChAXO4100jEQUEpo4GPXcMkOrJNuQG7Vhu1Rlm XnjO1yIQOmwojHYokiaGYExXsy5jPeYKXuJf/rstlF5VfWE/S4d3PJgVVniOUATAOcTmR1 w3mTj9rcr+PrvTKjCxgw62xV4M0MmyfQus3WI1rSqANRwJrxysjimWcR9ZsB1w== 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=1711626134; 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=B+a0g7L6942jRFbafx+x185MYR+NWRwxQWGHTVOpo1w=; b=S7+0U8LBmpYe0OuYDqMd6nJbW29T4b/3ALrAKgzJbbV68Gg7rgfY9tg5g4+4LhYE6ErXcw fSlpMuzjiCWpbKBBH5DtcKPq+/95vaUlSCzMpK7QjXUm/wB21FZl+aXJismK6HooNADSHv SDerQBn2O0FSWcNOzCD/Vs2ncuNbeYe7IaQl4kRJfMHQjLKRDjHISm+8sltp+5spuod+5p s0gQ5ESSf6bmzy/OwrSa9xU3o0dKHz1f0VtWVxddLs57mtfnKSzWxgu1zqbRX0l12rIE8q 15s0L83Uso5Y5WSmdPBbWMmII5ekVKv4Axmg/Jq6iyS+nr1XIGnxM19iPBPJjQ== 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 4V51qB6KPlzQdS; Thu, 28 Mar 2024 11:42:14 +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 42SBgEcD072654; Thu, 28 Mar 2024 11:42:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42SBgEAw072651; Thu, 28 Mar 2024 11:42:14 GMT (envelope-from git) Date: Thu, 28 Mar 2024 11:42:14 GMT Message-Id: <202403281142.42SBgEAw072651@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: bf8e12d3e728 - main - Framework: Use WRK_ENV when handling USE_LOCALE List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf8e12d3e72868d97f4515c7dee6a22dd0f30e74 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=bf8e12d3e72868d97f4515c7dee6a22dd0f30e74 commit bf8e12d3e72868d97f4515c7dee6a22dd0f30e74 Author: Gleb Popov AuthorDate: 2024-03-28 06:21:00 +0000 Commit: Gleb Popov CommitDate: 2024-03-28 11:40:52 +0000 Framework: Use WRK_ENV when handling USE_LOCALE PR: 276478 --- Mk/bsd.port.mk | 3 +-- lang/ghc/Makefile | 2 +- math/scilab-toolbox-swt/Makefile | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 3e6dd7ec1daa..e120b2cd1632 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -2012,8 +2012,7 @@ ERROR+= "Unknown USES=${f:C/\:.*//}" . endif . if defined(USE_LOCALE) -CONFIGURE_ENV+= LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE} -MAKE_ENV+= LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE} +WRK_ENV+= LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE} . endif # Macro for doing in-place file editing using regexps. REINPLACE_ARGS may only diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index 5e6fda6901af..3d64f3d7b49b 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -135,7 +135,7 @@ CONFIGURE_ARGS+= --with-system-libffi --with-ffi-includes=${LOCALBASE}/include - CONFIGURE_ENV+= CC=${CC} CXX=${CXX} SHEBANG_FILES+= hadrian/bootstrap/bootstrap.py HADRIAN_CMD= ${WRKSRC}/hadrian/bootstrap/_build/bin/hadrian ${HADRIAN_DOCS_ARG} ${HADRIAN_GMP_ARG} -DO_MAKE_BUILD= ${SETENV} ${MAKE_ENV} ${HADRIAN_CMD} ${_MAKE_JOBS} --flavour=ports +DO_MAKE_BUILD= ${SETENVI} ${WRK_ENV} ${HADRIAN_CMD} ${_MAKE_JOBS} --flavour=ports ALL_TARGET= binary-dist-dir INSTALL_WRKSRC= ${WRKSRC}/_build/bindist/ghc-${GHC_VERSION}-${CONFIGURE_TARGET} INSTALL_TARGET= install diff --git a/math/scilab-toolbox-swt/Makefile b/math/scilab-toolbox-swt/Makefile index daffac10f7ca..4607c3fc1695 100644 --- a/math/scilab-toolbox-swt/Makefile +++ b/math/scilab-toolbox-swt/Makefile @@ -18,7 +18,7 @@ USE_LOCALE= en_US.UTF-8 SCILAB_CMD= ${LOCALBASE}/bin/scilab-adv-cli SCILAB_ARGS= -noatomsautoload -nb -nouserstartup -MAKE_ENV= SCI_JAVA_ENABLE_HEADLESS=1 SCI_DISABLE_TK=1 +WRK_ENV= SCI_JAVA_ENABLE_HEADLESS=1 SCI_DISABLE_TK=1 DOS2UNIX_FILES= etc/swt.start CONTRIBDIR?= share/scilab/contrib @@ -57,7 +57,7 @@ pre-build: do-build: cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${SCILAB_CMD} ${SCILAB_ARGS} -f builder.sce + ${SETENVI} ${WRK_ENV} ${SCILAB_CMD} ${SCILAB_ARGS} -f builder.sce do-install: cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${TOOLBOXDIR} "-name *\.so -or -name loader*\.sce"