From nobody Fri Mar 24 17:39:01 2023 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 4PjqFd63L6z40sC5; Fri, 24 Mar 2023 17:39:01 +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 4PjqFd4ymVz4SqP; Fri, 24 Mar 2023 17:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679679541; 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=sKqVqD/A8t5W8WvhIDqoPb4yV0nOML09q+NMTY2xs/M=; b=i57mDIPw6uoVze7+8CDef9Cg09GpXPaBY14QAQQHu13GnUV0R7ZICbh09qx1+rnncFKIu/ b4dJTy/4NTKGUE9VHob7Ffjq1knhEDFKTAAmX8nUg8kEnslEQaxQEOA+XOHahP+r7FCelu j7uHOOQred7uJM60OEBQj64yyvBsbJHpATm815sXpPyZR5rKkPoI3EmWkz0XSYhCILy3yg FhZq7AysWxN9J+87n0Ty8hOLIH4z+V7w6iR7iphN4I7lDTD4GOkObnTd3ZiuK16yJbbr7V 3jFegTfvpMphmUvehVsWTgS6sug3kUoWESZosgPR66LVyxUjXmszw31AUqILCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679679541; 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=sKqVqD/A8t5W8WvhIDqoPb4yV0nOML09q+NMTY2xs/M=; b=PJ7ro8VJQB/FL4jFKJcLtj7uZ8YC3N6Xeeo/a1827tPSdqy8QcjSXf/M8HJ/0UIrvqSpXG VScp9BlaXHQzsTWKGgvuFS6STgXGLrts6gv0YVPJeNq4MERlurFEinob6HTQbW6sN2ylER D4y7yYWf6w+7WmZ0o8qjUn19p7iotHEwAFzjKXt7nrona3FWbqO+bgLj13znaPz05hPkqJ hIC4NiOuLJ/hIvtQwB3uPQtxa4I6+TN09dFZVnw9emfcRPJiL8Z37QzspGPwWvrmq64nEo eADaFnuZ31ZQtgVEKw6Mx6JVzbvupx31PQNFd4e0oFd2clYUrLfTHmjJXvoZBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679679541; a=rsa-sha256; cv=none; b=Xlm9+ySpQ7c3l0/6oK5PSMSKpenAGQJc09ZmRrnfBZRt9lZhfKc9It8OOwMg6Fv/b7CxCL lv/JxD2bxCjaXD+s+bUSo8l6BAMsgjqktXwmS6TSD50YxPhu37VIdovl7FGc5zWwu7tK/4 gm2HOcq0cNmHFigbKlZfbqVWmcuWMqk3ZaQvRKjukKUAbbVNMccmTorsDXMzTTc3slrvyy uFXS01yFlPqI0LChsi1+rNsfsd7z3o58BMJ3TdosUBDu1RKrwm/Bsj1sSbdSXaPHh6mxhk NeiJirhw3HIYEfLglu7nt/n/K6uf4L18p3HD4LcaAmW0iYKQdv+VONZmqj5Q+g== 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 4PjqFd44nlzRtv; Fri, 24 Mar 2023 17:39:01 +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 32OHd1p7059317; Fri, 24 Mar 2023 17:39:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32OHd1fN059316; Fri, 24 Mar 2023 17:39:01 GMT (envelope-from git) Date: Fri, 24 Mar 2023 17:39:01 GMT Message-Id: <202303241739.32OHd1fN059316@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: 565a7ea09bdb - main - Uses/cabal.mk: Extend the text-2 workaround to 12.3-RELEASE. 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 565a7ea09bdb7188c672044fe5bd05f9b48dffba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=565a7ea09bdb7188c672044fe5bd05f9b48dffba commit 565a7ea09bdb7188c672044fe5bd05f9b48dffba Author: Gleb Popov AuthorDate: 2023-03-24 17:21:24 +0000 Commit: Gleb Popov 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'