Attachment 235813 Details for Bug 265745 – 0001-lang-mono6.8-Fix-build-with-archivers-brotli

[patch] 0001-lang-mono6.8-Fix-build-with-archivers-brotli

0001-lang-mono6.8-Fix-build-with-archivers-brotli.patch (text/plain), 1.15 KB, created by Felix Palmen on 2022-08-09 19:21:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Felix Palmen

Created: 2022-08-09 19:21:00 UTC

Size: 1.15 KB

patch

obsolete

>From 261857de0a7aea87c634d03d39fc6c190fd2da7c Mon Sep 17 00:00:00 2001
>From: Felix Palmen <zirias@FreeBSD.org>
>Date: Tue, 9 Aug 2022 20:56:11 +0200
>Subject: [PATCH] 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.
>---
> 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
> 
>-- 
>2.37.1
>

Flags:

zirias: maintainer-approval? (mono)
koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 265745: 235813