From nobody Mon Jan 10 23:10:24 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 0BABA1949194; Mon, 10 Jan 2022 23:10:25 +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 4JXqL84zJSz4sqM; Mon, 10 Jan 2022 23:10:24 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 871C561A1; Mon, 10 Jan 2022 23:10:24 +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 20ANAOm3073676; Mon, 10 Jan 2022 23:10:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20ANAO9m073675; Mon, 10 Jan 2022 23:10:24 GMT (envelope-from git) Date: Mon, 10 Jan 2022 23:10:24 GMT Message-Id: <202201102310.20ANAO9m073675@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan E=C3=9Fer?= Subject: git: 2f60a4c22c0e - main - devel/llvm-devel: update CONFLICTS_INSTALL 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: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f60a4c22c0e16fe16472cda3412682481cf1b43 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641856224; 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=zsFK+4bwixn8bie1qC/cifqNcuW53buTMZRlDuGddAg=; b=PoPvPla9u8MUGgzyijih7e1sK/CHd0iH9jAgJLyppxF5lssSFbLRDK1iUHakvl5MXCVXH6 noAf92zr9sSpe5wn8jd7rNsgxEzIaRcTTzRxLHp803OPW76YK3N5TanVmoam9sZcFnTz/G vUuPBOWY/HAhak3u2LdZx5rlSWwoR1eG2VkLsGECzsn1yxEgUI/qFQ8hmNUeYnK5YXvBXI ReO+5fR82X2X2LFuVONw2E3RxU0OqfosIYdhMzHAONPrxc6KAeEr/VzcZDuYtutqmyobif HiIVbVYNgnCv/HS3Q2+Ib2/l74NX9O8Y0flM9PVFP7MSO2S+/ddxYendRhG2kQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641856224; a=rsa-sha256; cv=none; b=vOkktoldmB//VvJ6vgaHAV4/FxlqoUIeagNk7HTJHOa/nHHfve8/ChrHAO0vaYmrAYW+cI nMEI1/J7+rnO6JmFFo5WqeuMluW951uUZGiOtsxZ4Vodvrh5b6wvAbCgGr89CxX8joTQKy dQa/Yb+8gvAZxjZAKvHOG509W6choo/SW6OGeVIiGFfKfTtMs+aVGIcOkvm0h0Fm7usFKT CJk01TYr4vfsNp3H86CF867xeQRW4XGH7tASl/ISRZ+EE62QGrr/batZ/YKxV3qPaPd480 y3xi51K2wQfq+bED/2mFJgQ8vbU0chUfAxZz1qjoAQc/k63JSBq8/38GtFE+Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f60a4c22c0e16fe16472cda3412682481cf1b43 commit 2f60a4c22c0e16fe16472cda3412682481cf1b43 Author: Stefan Eßer AuthorDate: 2022-01-10 23:06:57 +0000 Commit: Stefan Eßer CommitDate: 2022-01-10 23:06:57 +0000 devel/llvm-devel: update CONFLICTS_INSTALL There are 2 packages that can be built from this port (llvm-devel and llvm-devel-lite) and they conflict with each other. Approved by: portmgr (implicit) --- devel/llvm-devel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index f5c7586b782c..11d150e3c9ef 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -173,7 +173,7 @@ GOLD_DESC= Build the LLVM Gold plugin for LTO GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include GOLD_BUILD_DEPENDS= ${LOCALBASE}/bin/ld.gold:devel/binutils -CONFLICTS_INSTALL= llvm-devel +CONFLICTS_INSTALL= llvm-devel llvm-devel-lite PLIST_SUB+= LLVM_MAJOR=${LLVM_MAJOR} \ LLVM_RELEASE=${LLVM_RELEASE}