Date: Wed, 26 May 2021 03:07:53 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f3ffaa8269c5 - main - lang/mono6.8: register build-time conflict against archivers/brotli Message-ID: <202105260307.14Q37rpv047358@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=f3ffaa8269c5c1c1e43ccdad7f60309b3ffeee02 commit f3ffaa8269c5c1c1e43ccdad7f60309b3ffeee02 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2021-05-26 03:07:04 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2021-05-26 03:07:19 +0000 lang/mono6.8: register build-time conflict against archivers/brotli The build fails if `archivers/brotli' port is installed, with the errors quoted below. It does not happen in pristine environments, but may affect users who build ports locally. ../../external/corefx/src/Native/AnyOS/brotli/enc/dictionary_hash.c:16:1: error: unknown type name 'BROTLI_INTERNAL' BROTLI_INTERNAL const uint16_t kStaticDictionaryHash[32768] = { ^ ../../external/corefx/src/Native/AnyOS/brotli/enc/dictionary_hash.c:16:31: error: expected ';' after top level declarator BROTLI_INTERNAL const uint16_t kStaticDictionaryHash[32768] = { ^ ; 2 errors generated. --- lang/mono6.8/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/lang/mono6.8/Makefile b/lang/mono6.8/Makefile index 07ec0a3d15a7..6e4f63d6c457 100644 --- a/lang/mono6.8/Makefile +++ b/lang/mono6.8/Makefile @@ -24,6 +24,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ sqlite3>0:databases/sqlite3 \ zip>=0:archivers/zip +CONFLICTS_BUILD= brotli CONFLICTS_INSTALL= czmq-3* mono5.10 mono6.8 USES= autoreconf bison compiler:c11 cpe gmake iconv libtool \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105260307.14Q37rpv047358>