kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sysutils/bhyve+: Add explicit support for 14-CURRENT

Browse source 
Reported by:	pkg-fallout
This commit is contained in:
PÁLI Gábor János 2021-09-25 15:38:32 +02:00 committed by Ashish SHUKLA
parent 4ad28ab766
commit 97ee34980f
9 changed files with 135 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sysutils/bhyve+/Makefile
View file

@ -37,8 +37,10 @@ USE_LDCONFIG= yes
EXTRA_PATCHES= ${PATCHDIR}/freebsd-11
.elif 1200000 <= ${OSVERSION} && ${OSVERSION} < 1300000
EXTRA_PATCHES= ${PATCHDIR}/freebsd-12
.elif 1300000 <= ${OSVERSION}
.elif 1300000 <= ${OSVERSION} && ${OSVERSION} < 1400000
EXTRA_PATCHES= ${PATCHDIR}/freebsd-13
.elif 1400000 <= ${OSVERSION} && ${OSVERSION} < 1500000
EXTRA_PATCHES= ${PATCHDIR}/freebsd-14
.else
. if empty(IGNORE)
IGNORE+= cannot build: unsupported system
@ -51,6 +53,7 @@ _LINKS= sys/cam/ctl \
sys/dev/e1000 \
sys/dev/mii \
sys/dev/usb/controller \
sys/dev/virtio \
sys/amd64/include \
sys/x86/include \
stand/userboot

0
sysutils/bhyve+/files/patch-libvmmapi → sysutils/bhyve+/files/freebsd-11/patch-libvmmapi
View file

33
sysutils/bhyve+/files/freebsd-12/patch-libvmmapi Normal file
View file

@ -0,0 +1,33 @@
--- lib/libvmmapi/Makefile.orig 2021-09-04 01:05:23.110816000 UTC
+++ lib/libvmmapi/Makefile
@@ -6,6 +6,7 @@
INCS= vmmapi.h
WARNS?= 2
+SHLIB_MAJOR?= 5.1
LIBADD= util
--- usr.sbin/bhyvectl/Makefile.orig 2021-09-04 02:33:12.704720000 +0200
+++ usr.sbin/bhyvectl/Makefile 2021-09-04 02:34:28.740202000 +0200
@@ -8,7 +8,8 @@
MAN= bhyvectl.8
-LIBADD= vmmapi util
+LIBADD= util
+LDADD= ../../lib/libvmmapi/libvmmapi.so.5.1
WARNS?= 3
--- usr.sbin/bhyveload/Makefile.orig 2021-09-04 02:33:20.942548000 +0200
+++ usr.sbin/bhyveload/Makefile 2021-09-04 02:35:58.712996000 +0200
@@ -5,7 +5,7 @@
MAN= bhyveload.8
PACKAGE= bhyve
-LIBADD= vmmapi
+LDADD= ../../lib/libvmmapi/libvmmapi.so.5.1
WARNS?= 3

33
sysutils/bhyve+/files/freebsd-13/patch-libvmmapi Normal file
View file

@ -0,0 +1,33 @@
--- lib/libvmmapi/Makefile.orig 2021-09-04 01:05:23.110816000 UTC
+++ lib/libvmmapi/Makefile
@@ -6,6 +6,7 @@
INCS= vmmapi.h
WARNS?= 2
+SHLIB_MAJOR?= 5.1
LIBADD= util
--- usr.sbin/bhyvectl/Makefile.orig 2021-09-04 02:33:12.704720000 +0200
+++ usr.sbin/bhyvectl/Makefile 2021-09-04 02:34:28.740202000 +0200
@@ -8,7 +8,8 @@
MAN= bhyvectl.8
-LIBADD= vmmapi util
+LIBADD= util
+LDADD= ../../lib/libvmmapi/libvmmapi.so.5.1
WARNS?= 3
--- usr.sbin/bhyveload/Makefile.orig 2021-09-04 02:33:20.942548000 +0200
+++ usr.sbin/bhyveload/Makefile 2021-09-04 02:35:58.712996000 +0200
@@ -5,7 +5,7 @@
MAN= bhyveload.8
PACKAGE= bhyve
-LIBADD= vmmapi
+LDADD= ../../lib/libvmmapi/libvmmapi.so.5.1
WARNS?= 3

12
sysutils/bhyve+/files/freebsd-14/patch-bhyvectl Normal file
View file

@ -0,0 +1,12 @@
--- usr.sbin/bhyvectl/Makefile.orig 2021-09-04 02:33:12.704720000 +0200
+++ usr.sbin/bhyvectl/Makefile 2021-09-04 02:34:28.740202000 +0200
@@ -10,7 +10,8 @@
MAN= bhyvectl.8
-LIBADD= vmmapi util
+LIBADD= util
+LDADD= ${SRCTOP}/lib/libvmmapi/libvmmapi.so.5.1
WARNS?= 3

11
sysutils/bhyve+/files/freebsd-14/patch-bhyveload Normal file
View file

@ -0,0 +1,11 @@
--- usr.sbin/bhyveload/Makefile.orig 2021-09-25 15:07:46.189926000 +0000
+++ usr.sbin/bhyveload/Makefile 2021-09-25 15:08:40.718294000 +0000
@@ -5,7 +5,7 @@
MAN= bhyveload.8
PACKAGE= bhyve
-LIBADD= vmmapi
+LDADD= ${SRCTOP}/lib/libvmmapi/libvmmapi.so.5.1
WARNS?= 3

21
sysutils/bhyve+/files/freebsd-14/patch-custom-libs Normal file
View file

@ -0,0 +1,21 @@
--- usr.sbin/bhyve/Makefile.orig 2021-09-04 02:15:16.364660000 +0200
+++ usr.sbin/bhyve/Makefile 2021-09-04 02:21:26.014446000 +0200
@@ -3,7 +3,7 @@
#
.include <src.opts.mk>
-CFLAGS+=-I${.CURDIR}/../../contrib/lib9p
+CFLAGS+=-I${SRCTOP}/contrib/lib9p
CFLAGS+=-I${SRCTOP}/sys
.PATH: ${SRCTOP}/sys/cam/ctl
@@ -83,7 +83,8 @@
.PATH: ${BHYVE_SYSDIR}/sys/amd64/vmm
SRCS+= vmm_instruction_emul.c
-LIBADD= vmmapi md nv pthread z util sbuf cam 9p
+LIBADD= md nv pthread z util sbuf cam
+LDADD= ${SRCTOP}/contrib/lib9p/lib9p.so.1.1 ${SRCTOP}/lib/libvmmapi/libvmmapi.so.5.1
.if ${MK_CASPER} != "no"
LIBADD+= casper

12
sysutils/bhyve+/files/freebsd-14/patch-lib9p Normal file
View file

@ -0,0 +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 @@
# 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"

9
sysutils/bhyve+/files/freebsd-14/patch-libvmmapi Normal file
View file

@ -0,0 +1,9 @@
--- lib/libvmmapi/Makefile.orig 2021-09-04 01:05:23.110816000 UTC
+++ lib/libvmmapi/Makefile
@@ -6,6 +6,7 @@
INCS= vmmapi.h
+SHLIB_MAJOR?= 5.1
LIBADD= util