Attachment 230197 Details for Bug 260488 – git am

[patch] git am

0001-sysutils-bhyve-Fix-patch-on-FreeBSD-14.patch (text/plain), 1.31 KB, created by Mikael Urankar on 2021-12-17 08:39:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2021-12-17 08:39:46 UTC

Size: 1.31 KB

patch

obsolete

>From 9f0ada310159f21df592ea6f17bcc6f1f20e0d87 Mon Sep 17 00:00:00 2001
>From: mikael <mikael@FreeBSD.org>
>Date: Fri, 17 Dec 2021 09:36:52 +0100
>Subject: [PATCH] sysutils/bhyve+: Fix patch on FreeBSD 14
>
>PR:		260488
>Reported by:	O. Hartmann
>Approved by:	portmgr (build fix blanket)
>---
> sysutils/bhyve+/files/freebsd-14/patch-lib9p | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/sysutils/bhyve+/files/freebsd-14/patch-lib9p b/sysutils/bhyve+/files/freebsd-14/patch-lib9p
>index 97f2fd5b00a7..ba1ee70fd8b2 100644
>--- a/sysutils/bhyve+/files/freebsd-14/patch-lib9p
>+++ b/sysutils/bhyve+/files/freebsd-14/patch-lib9p
>@@ -1,12 +1,12 @@
> --- share/mk/src.libnames.mk.orig	2021-09-04 10:14:17.407288000 +0200
> +++ share/mk/src.libnames.mk	2021-09-04 10:15:27.832153000 +0200
>-@@ -245,6 +245,9 @@
>+@@ -261,6 +261,9 @@ LIBVERIEXEC?=	${LIBVERIEXECDIR}/libveriexec.a
>  # 2nd+ order consumers.  Auto-generating this would be better.
>  _DP_80211=	sbuf bsdxml
>  _DP_9p=		sbuf
> +.if ${MK_CASPER} != "no"
> +_DP_9p+=       casper cap_pwd cap_grp
> +.endif
>- _DP_archive=	z bz2 lzma bsdxml zstd
>- _DP_zstd=	pthread
>- .if ${MK_BLACKLIST} != "no"
>+ # XXX: Not bootstrapped so uses host version on non-FreeBSD, so don't use a
>+ # FreeBSD-specific dependency list
>+ .if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING)
>-- 
>2.34.1
>

Actions: View | Diff

Attachments on bug 260488: 230196 | 230197