git: 1303528e49c7 - main - lang/mono6.8: Fix build with archivers/brotli
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 10 Aug 2022 10:07:56 UTC
The branch main has been updated by zirias:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1303528e49c7fec9160e60090ca0a2e7713f5294
commit 1303528e49c7fec9160e60090ca0a2e7713f5294
Author: Felix Palmen <zirias@FreeBSD.org>
AuthorDate: 2022-08-09 18:56:11 +0000
Commit: Felix Palmen <zirias@FreeBSD.org>
CommitDate: 2022-08-10 10:07:24 +0000
lang/mono6.8: Fix build with archivers/brotli
Add USES=localbase, so in-tree headers are found before headers in
LOCALBASE. This fixes the build with archivers/brotli installed.
CONFLICTS isn't an option any more, after
478e294ddedbe6444330b00512a09406265bea71, archivers/brotli is an
indirect build dependency.
PR: 265745
Approved by: portmgr (build fix blanket), tcberner (mentor)
---
lang/mono6.8/Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lang/mono6.8/Makefile b/lang/mono6.8/Makefile
index 79091a92c5f9..d0d6605cdee3 100644
--- a/lang/mono6.8/Makefile
+++ b/lang/mono6.8/Makefile
@@ -23,10 +23,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
sqlite3>0:databases/sqlite3 \
zip>=0:archivers/zip
-CONFLICTS_BUILD= brotli
CONFLICTS_INSTALL= certmgr coin-or-disco disco mono mono[0-9]*
-USES= autoreconf bison compiler:c11 cpe gmake iconv libtool \
+USES= autoreconf bison compiler:c11 cpe gmake iconv libtool localbase \
pathfix perl5 python:3.6+ shebangfix tar:xz
USE_PERL5= build