Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Mar 2023 17:39:01 GMT
From:      Gleb Popov <arrowd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 565a7ea09bdb - main - Uses/cabal.mk: Extend the text-2 workaround to 12.3-RELEASE.
Message-ID:  <202303241739.32OHd1fN059316@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=565a7ea09bdb7188c672044fe5bd05f9b48dffba

commit 565a7ea09bdb7188c672044fe5bd05f9b48dffba
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2023-03-24 17:21:24 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2023-03-24 17:38:50 +0000

    Uses/cabal.mk: Extend the text-2 workaround to 12.3-RELEASE.
---
 Mk/Uses/cabal.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk
index dfed8484b646..9654ac1b0c11 100644
--- a/Mk/Uses/cabal.mk
+++ b/Mk/Uses/cabal.mk
@@ -81,7 +81,8 @@ IGNORE=		CABAL_PROJECT: invalid value: ${CABAL_PROJECT}
 BROKEN=		${USE_CABAL:Mbasement-0.0.1[4-5]} package doesn't compile on i386
 .  endif
 
-.  if ${OSVERSION} >= 1301000 && ${OSVERSION} < 1302000 && defined(USE_CABAL) && ${USE_CABAL:Mtext-2.*}
+.  if ((${OSVERSION} >= 1301000 && ${OSVERSION} < 1302000) \
+    || ${OSVERSION} < 1204000) && defined(USE_CABAL) && ${USE_CABAL:Mtext-2.*}
 # Band-aids for a Clang bug that is shipped with FreeBSD 13.1
 BUILD_DEPENDS+=	clang15:devel/llvm15
 BUILD_ARGS+=	--ghc-options='-pgmc clang++15'



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303241739.32OHd1fN059316>