From nobody Wed Jul 27 14:56:50 2022 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 4LtH1G5r26z4XlkD; Wed, 27 Jul 2022 14:56:50 +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 4LtH1G5R2rz3lxL; Wed, 27 Jul 2022 14:56:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658933810; 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=Gh1ouSquwmzkq+vVLRU9hDGobkUI7uzrUGM0OnW8c7g=; b=KEK2TOTNnBf1PVtvDbO/LNP3OnmgoT/LLPWO87hzrQDNke2XExC9GPN3NEznt49daP2MV2 erwYEjtml+dv4EyG5biI0a85pyHhnNkFF2/O8AV11DQJrZCd+A9T424yZKSy+MFYZMHdd5 H+7za3DNb9D/kIpa3RlfBVmBq6Aje+CD3Y1AiadBpJlUpTsNTsVRSglaxP7DgTrECefi3e myBP5PXLTCfQhkwQKuPLib8LNr6HPdaLgOJsKMYFq7wyuqan10JQL2VLLdtyl0cAnePCVM Y8Qp/gAMOK5H6EFOdKrSeINMfLhkSQpKDB85JFG/A7Tx9GS2wFcFIo9CiqHqtg== 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 4LtH1G4StnzLSF; Wed, 27 Jul 2022 14:56:50 +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 26REuoXX005168; Wed, 27 Jul 2022 14:56:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26REuoOr005167; Wed, 27 Jul 2022 14:56:50 GMT (envelope-from git) Date: Wed, 27 Jul 2022 14:56:50 GMT Message-Id: <202207271456.26REuoOr005167@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: 92e98a2584dd - main - Uses/cabal.mk: Simplify USE_LOCALE handling. 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: 92e98a2584dd2df4fb449c376e3f00efc6388246 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658933810; 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=Gh1ouSquwmzkq+vVLRU9hDGobkUI7uzrUGM0OnW8c7g=; b=Ri3oqnVD+T4GwKZA+kVSLvf6Uw95mUZUJBH/ls3Pcs0B30p7xd2d8gR3AxDOJgwF5nCurN JEeYBQOD2uocArJrtBfAXN6iWUH086yvJmZNOykeeyU06thfqGplts8W3LYVyxzUwdy9kn dCTdx5Da/RRxvZj+2gh49cVyWZPUggDUE+jpDSCdXarlG2BWivTXATIjJWcTr9yyAFKl1J E5fjhB3R/2exR2bDlFLeMGWJL1+t7eJEjWlKYg4jCbGjzM1ROc9vN08i74G+hm4PpDjOq8 XhGnm5N9uG6AAZmLPpjUw57l+9Dxb9zj6NrFrXMjyoMhEvDfkIg3XfT/LRgg1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658933810; a=rsa-sha256; cv=none; b=W1jw9ka0X9mgDEjuvtH5WAVDniExAaduW3/umnMPPYxZh7tIReNrrf2qAGcTgPCN4Yquky ngxLsWMYScWdgbetik6P6UO+OGyFK7w+cm8ZegwITqgya1MHE9xkQMdI+EPT2cMNVK79nN LOvEPNMt7bQXUkiTCCNr+o3mGdiJW7ueWeH5nY9pfDPvcL7cHrKl5o4JwylZUvqsTew7P1 ib4SLQtKJmL5X60Cl2F0Wn3ugdExrExBOhIjzyv9hLGNjz/04maO1jg4k3I5hcWzGJrHux Jx2taWI96GlwFXdUEE8EEZM62tpgn95tHiRuIUZdZqr4p+qFeO9AC8ERAL3gTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=92e98a2584dd2df4fb449c376e3f00efc6388246 commit 92e98a2584dd2df4fb449c376e3f00efc6388246 Author: Gleb Popov AuthorDate: 2022-07-27 07:28:35 +0000 Commit: Gleb Popov CommitDate: 2022-07-27 14:55:50 +0000 Uses/cabal.mk: Simplify USE_LOCALE handling. --- Mk/Uses/cabal.mk | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index 748bdced162c..ee0ee4a2856e 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -118,10 +118,6 @@ _USES_stage= 751:cabal-post-install-script BUILD_TARGET?= ${EXECUTABLES:S/^/exe:&/} -. if defined(USE_LOCALE) -LOCALE_ENV= LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE} -. endif - _use_cabal= ${USE_CABAL:O:u} . for package in ${_use_cabal} @@ -155,7 +151,7 @@ cabal-extract: check-cabal ${WRKDIR} ${SETENV} HOME=${CABAL_HOME} ${CABAL_CMD} update . if ${_hackage_is_default} == yes cd ${WRKDIR} && \ - ${SETENV} ${LOCALE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} get ${PORTNAME}-${PORTVERSION} + ${SETENV} ${MAKE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} get ${PORTNAME}-${PORTVERSION} . else ${MV} ${CABAL_HOME} /tmp/${PORTNAME}-cabal-home cd ${.CURDIR} && ${MAKE} extract CABAL_BOOTSTRAP=yes @@ -170,12 +166,12 @@ cabal-extract: check-cabal ${WRKDIR} # Calls cabal configure on the Haskell package located in ${WRKSRC} cabal-configure: check-cabal cd ${WRKSRC} && \ - ${SETENV} ${LOCALE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} configure --disable-benchmarks --disable-tests --flags="${CABAL_FLAGS}" ${CABAL_WITH_ARGS} ${CONFIGURE_ARGS} + ${SETENV} ${MAKE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} configure --disable-benchmarks --disable-tests --flags="${CABAL_FLAGS}" ${CABAL_WITH_ARGS} ${CONFIGURE_ARGS} # Calls cabal build on the Haskell package located in ${WRKSRC} cabal-build: check-cabal cd ${WRKSRC} && \ - ${SETENV} ${LOCALE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} build --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} ${BUILD_ARGS} ${BUILD_TARGET} + ${SETENV} ${MAKE_ENV} HOME=${CABAL_HOME} ${CABAL_CMD} build --disable-benchmarks --disable-tests ${CABAL_WITH_ARGS} ${BUILD_ARGS} ${BUILD_TARGET} # Generates USE_CABAL= ... line ready to be pasted into the port based on the plan.json file generated by cabal configure. make-use-cabal: check-cabal2tuple