From nobody Tue Apr 25 17:25:35 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 4Q5TRM4q2Mz46T3t; Tue, 25 Apr 2023 17:25:35 +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 4Q5TRM44HTz41jW; Tue, 25 Apr 2023 17:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682443535; 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=7RIe1N3L+eYT9FcFFiEYNXLGmn5pgzn5pM7t1BQYmjg=; b=rWyCqCTehKZVJv9I0ps5wYC+wdoXZzHfN6TqY+zxNzaGIyYMAuRPkyzFMcBbEMV3iHTCfL Ys+jTz8t3UesI6XG8S3N0oRmJa014Nl4AtL5QLr8rqApo0kzlnf3fftUJS3BNgMhwBEyyI 3N9yNfADxU5pBjUPViG9DeblpPfMecxkl2Is4U46ioG7ljWzZg/4MWpZON/AKHfknzEXnj w3Bi1Xw94oSl/FPj/1zXtw9VgaY62AMU2YZtdTrFWFxTLVU82cKUQujkfnLJBfTS/sW/N+ 5tKRJoiGjg5H6/yk6wg3aOKEkcO9XnrqgPg1a7f60DL7xN+/tLK34HqkkLLzNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682443535; 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=7RIe1N3L+eYT9FcFFiEYNXLGmn5pgzn5pM7t1BQYmjg=; b=CKl+nW6FRt0a5+Nuc2++DqL4OXUOmNHwfGMWofADp78lQwKQb6eV+mBgsLf5nkWY7LD1Bm uwNBfjkdVzj9iX99kJyUjkktaAS2GLcDVYJFahImSD5BYwNwnAEudqjg765vekzk+5axav uek7lsDWpuhUtFPurN+SRVxqtWeIC+8i9S5Xafroj7m8+Ou7N9ZeqvNhD4ybudO5+gSSfc 3P6/XpmgYnBmyCnb054ZtCTrzi0YnrPrXENgTzN+abqtDt1BFocSBhfGp2K3zRCkVhq4fw MtrOl3UPBhrlVr6Dr37SqkiU2e9MraXbFWHBi5ASX/73RksPDlmAH/yfNrisPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682443535; a=rsa-sha256; cv=none; b=w3+wM7Ruct9trSj1+21+/nBv0ufywjydcBQ5Vu3MS58gCarx9+v6Yd4xVlOLpbhDiIlQmk pi6ciyy31bKw1MtEe5Pw3nhW7LMwnfpyIpNiHyCql1w/wsSTEZjN4dYNaGcQzeNhsNxd9P VGpMk5pfmWdRVO5WUTvzn8aGw+cUgxEkxGPaJfDTS5EbdhZStXBrogbhgjoQBaAam3PehC G3mEbJ9xDgWmo51tImnInVN4e3sr9RNUFcTv+q4QsNO2pGIbsZBIslNvWjhJrlLPzpJIhG rQ/FsrmlRoHfcpYl0oNKlS9WsggwgmfR0Z2DtOnlon7m7+CGmZXAFJxu3JNP0A== 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 4Q5TRM3B6Lz1G03; Tue, 25 Apr 2023 17:25:35 +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 33PHPZW0028492; Tue, 25 Apr 2023 17:25:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33PHPZsK028491; Tue, 25 Apr 2023 17:25:35 GMT (envelope-from git) Date: Tue, 25 Apr 2023 17:25:35 GMT Message-Id: <202304251725.33PHPZsK028491@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: f9a1f46c48e1 - main - Uses/cabal.mk: Extend Clang workaround to FreeBSD 12.4 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: f9a1f46c48e1f50246e63be780bfd0b65d9800d7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=f9a1f46c48e1f50246e63be780bfd0b65d9800d7 commit f9a1f46c48e1f50246e63be780bfd0b65d9800d7 Author: Gleb Popov AuthorDate: 2023-04-25 17:23:03 +0000 Commit: Gleb Popov CommitDate: 2023-04-25 17:25:31 +0000 Uses/cabal.mk: Extend Clang workaround to FreeBSD 12.4 Reported by: pkg-fallout --- Mk/Uses/cabal.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index dfed8484b646..92dbec7a9553 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -81,8 +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.*} -# Band-aids for a Clang bug that is shipped with FreeBSD 13.1 +. if ${OSVERSION} < 1302000 && defined(USE_CABAL) && ${USE_CABAL:Mtext-2.*} +# Band-aids for a Clang bug that is shipped with FreeBSD < 13.2 BUILD_DEPENDS+= clang15:devel/llvm15 BUILD_ARGS+= --ghc-options='-pgmc clang++15' . endif