From nobody Tue Apr 25 17:26:15 2023 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 4Q5TS85CZJz46T01; Tue, 25 Apr 2023 17:26:16 +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 4Q5TS81Tjdz41k6; Tue, 25 Apr 2023 17:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682443576; 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=/l46sjR2O7kViRViBUv6OT2jkNWFsEmU9Zpj0YY72Qk=; b=ox6c71qG7zxtS5aGnMV51BbL4VE5QPAoFnG+m0MMioMRpljsPNUZ7o0CgB8/PYp31cmhHf v3Pi+DYDRi+IYJ+jAYF2yux2PhdQxcKgaW5MR3guC+8WNbStnIaXXLNF1KVz6kjk5Le/bU xmPRdU5m/1TAGiPZqgDzG6ODcDRe3jGklA7y1vrNrFCs35tU/mfhj7cDHuuB+B9crKorB8 L1G0RECaIRXamNwaKmvogQX7LvRRVQaJlS664x+PIE3pBFMNWemMcdiPzKGjtklypINJdh zgvkAdlO6sO1bn5BN03xT1rXez81mxwCgc0Yu8fCO5fcnGGgrhmE1g11oTJnrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682443576; 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=/l46sjR2O7kViRViBUv6OT2jkNWFsEmU9Zpj0YY72Qk=; b=VZX6FRs8boZVJgB1+HhTaZDFnJF01HsrPdSRfhbuG9E8wx1Mb6c6gn6REdwEak0A1X6XkI +RhCVEhicqjBHDBHMmf1kTLGlEgJ0QSHeC83nJ3Yym4D25Q3HqHUx3bTJePQ+gXHFQVfbr EDKJ59r32pr4st5E/u7p1UltBdpxDtm2ZkTxQS7glFRuT6qG0u+EjSFGPm4hRD/kNAshm0 mWzBghJOqzeVx92CjP9RlUkme02IGUoqmopMrFMjT0eeAvtVDw06eax2rJEOALkAkFbyW8 lBVEfPN9V7rrczhXqrHEMUbx2Yo5NqP7zfCPnZYNeSzD3F4S0dfsoNf/5W54vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682443576; a=rsa-sha256; cv=none; b=Dt/wCxT1u2JSxCAbfh2Ptwbx+rF8xMlW3IPiG/3siyItMP6MkMibnRklUBKgIYEhZxnN/M 9kxHxbFe7/jY3Pb8u8X6+eGx0pxe9mmXgGQIsNX9zRmgnaPVdqGniKpQOEbgm0oTm16NnU E9k/py1YoVf55/6fD1FMnXABL9OS+INn7topEHPPKib1gEPDo5punpPlZct9Ff2F+VDl92 vA2/xx/Z4O6lJSb0oom2yP1mqDMZDrlNeckUDKhUNpoZbnBUK20p8VrFC3CZfezIe8ggre Pfz1dDTLbkZQwPefZCqILjsdu5XZxN0GZezwSBw1J9ve1Y2midCTCULzWUQ+Bg== 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 4Q5TS80Ywwz1GLq; Tue, 25 Apr 2023 17:26:16 +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 33PHQFQ1028747; Tue, 25 Apr 2023 17:26:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33PHQFe3028746; Tue, 25 Apr 2023 17:26:15 GMT (envelope-from git) Date: Tue, 25 Apr 2023 17:26:15 GMT Message-Id: <202304251726.33PHQFe3028746@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Gleb Popov Subject: git: de50553fb56a - 2023Q2 - Uses/cabal.mk: Extend Clang workaround to FreeBSD 12.4 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/2023Q2 X-Git-Reftype: branch X-Git-Commit: de50553fb56aa92fdc040938a64e9b2529ffca71 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=de50553fb56aa92fdc040938a64e9b2529ffca71 commit de50553fb56aa92fdc040938a64e9b2529ffca71 Author: Gleb Popov AuthorDate: 2023-04-25 17:23:03 +0000 Commit: Gleb Popov CommitDate: 2023-04-25 17:26:11 +0000 Uses/cabal.mk: Extend Clang workaround to FreeBSD 12.4 Reported by: pkg-fallout (cherry picked from commit f9a1f46c48e1f50246e63be780bfd0b65d9800d7) --- 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