Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 10 Aug 2024 07:07:51 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: e73ddfead08a - main - misc/ollama: add CONFLICTS_BUILD
Message-ID:  <202408100707.47A77pnB073705@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e73ddfead08ab84bf7497bce15a608da068030cb

commit e73ddfead08ab84bf7497bce15a608da068030cb
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-08-10 07:06:17 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-08-10 07:07:35 +0000

    misc/ollama: add CONFLICTS_BUILD
---
 misc/ollama/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/misc/ollama/Makefile b/misc/ollama/Makefile
index 30490ace662f..1995935ddfae 100644
--- a/misc/ollama/Makefile
+++ b/misc/ollama/Makefile
@@ -22,6 +22,8 @@ LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
 
 USES=		go:1.22,modules pkgconfig
 
+CONFLICTS_BUILD=	llama-cpp
+
 GO_MODULE=	github.com/${PORTNAME}/${PORTNAME}
 GO_TARGET=	.
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408100707.47A77pnB073705>