From nobody Wed Mar 23 19:06:53 2022 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 CCBAD1A3AD69; Wed, 23 Mar 2022 19:06:53 +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 4KNyWx5Ms1z3sTr; Wed, 23 Mar 2022 19:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648062413; 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=wqadHlUE2nusGJIDd4yeGakVCR34+LaZOg4kAPQj2jM=; b=K/Ja/NUibTf5PH0wse9qwSkwiIhpiPf4y1csFioDbG2CoSTOuryFJVCGZnw+M8qo3wO3J/ a8vHffSsRpsUMh4VPWI8GexAO5FLnf4WwaLMdNTUfrH6F4ezhS0ZsUNmQX26OmhiAgi34p ElNKfPxJOEKV3fX/nZ3XjhZhYPn8Iru2SRFmdtfjY7w/OTfqdpC/Sk2wx+Gq1bEvAIIruP nAv+x693kzBrFUwzMIQlZeChIKjGEQVaQZTd0xqz9LkYruoJmST1ID0PIiB4odHbnRCFj3 ECsKyAoX5ggDHd6vTJGkd3m4Qo7IZkuTqXzbAdg1I6iq2Zp9VoFDfnkXP2yE2w== 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 98AA8112A; Wed, 23 Mar 2022 19:06:53 +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 22NJ6rgh053904; Wed, 23 Mar 2022 19:06:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22NJ6rBi053903; Wed, 23 Mar 2022 19:06:53 GMT (envelope-from git) Date: Wed, 23 Mar 2022 19:06:53 GMT Message-Id: <202203231906.22NJ6rBi053903@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: b4173875e5ef - main - x11-toolkits/vte3: Unbreak 12.3 with LLVM < 11 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: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4173875e5eff5fa5aa35f93e4af82f2695947a4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648062413; 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=wqadHlUE2nusGJIDd4yeGakVCR34+LaZOg4kAPQj2jM=; b=QK7NuVgWC68sf+45OpKMJo2qv0Dmd+J8v7x3IJoi85d4UsYN2Xed27tbR6Zj4JbAJZYhc5 672d8Voy7qcKRVTbszJRzavZJ5/GQePIIOoIuYY9/827VzZ1Rjj0wB+cNB7YzGsfHGl61R jDHjEyRvrkOjvTUffUWPNwEcsF/esbLAEXvFy4XoQ3CV1j/67ucTqWlnxUEW+ca7FrwhWf 1YSfwmBmsx6OzRd6qNxN2pmVcQ6+YA5Oh11HZovaNKJuBrPK7UjvoIN7WGvchlnSJ6PDDQ Svx+Ybr2kZSchKluSWBXwOhF1xaJBa1ASi42SMOFsfyxRKqaTdPi5oByThijog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648062413; a=rsa-sha256; cv=none; b=uDSVv4tYQv9KCERdCIpg5xpFsZfTjaMBvqClIbofSRfYMusKwd1PJPo8qX72MdUugfziJ4 UELJZcWsFzBb/5QP/Dr5/08yC6KKxgp4qoW022G6H5q6mAgTs6Lm1KXypZx/0L6nWNGpaR fpAGSnJLQz86rvdLyxGI9O6HWRsgvNIFqiSJAnT/lgcWS5RS045z51JVPl413mGhEiL89B s2iIQEcmfaKpJCy3yLrZI+bRJH4cB97IMG3rWYPNOiHTIbvL4N3Ecl56qeYKdLR9qn4TlE NCCfPEznEWPt5p7PY2FA13en9l8HgbtcG2DWNsfbtkqK3OODuOE8iFHyC28P0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=b4173875e5eff5fa5aa35f93e4af82f2695947a4 commit b4173875e5eff5fa5aa35f93e4af82f2695947a4 Author: VVD AuthorDate: 2022-03-23 19:06:13 +0000 Commit: Neel Chauhan CommitDate: 2022-03-23 19:06:13 +0000 x11-toolkits/vte3: Unbreak 12.3 with LLVM < 11 PR: 262736 --- x11-toolkits/vte3/Makefile | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/x11-toolkits/vte3/Makefile b/x11-toolkits/vte3/Makefile index 0845df70692e..467db3a10af3 100644 --- a/x11-toolkits/vte3/Makefile +++ b/x11-toolkits/vte3/Makefile @@ -39,6 +39,18 @@ PLIST_SUB= VERSION=2.91 BINARY_ALIAS= python3=${PYTHON_CMD} -LLVM_VERSION= 11 - -.include +.include + +.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} < 1300109 +CPP= ${LOCALBASE}/bin/clang-cpp${_LLVM_VERSION} +CC= ${LOCALBASE}/bin/clang${_LLVM_VERSION} +CXX= ${LOCALBASE}/bin/clang++${_LLVM_VERSION} +BUILD_DEPENDS+= llvm${_LLVM_VERSION}>=0:devel/llvm${_LLVM_VERSION} +.if (${LLVM_DEFAULT} == 90 || ${LLVM_DEFAULT} == 10) +_LLVM_VERSION= 11 +.else +_LLVM_VERSION= ${LLVM_DEFAULT} +.endif +.endif + +.include