git: 97ee34980fa2 - main - sysutils/bhyve+: Add explicit support for 14-CURRENT
Ashish SHUKLA
ashish at FreeBSD.org
Sat Sep 25 20:27:00 UTC 2021
The branch main has been updated by ashish:
URL: https://cgit.FreeBSD.org/ports/commit/?id=97ee34980fa2a4e8aaf03b19d5bda930e602641b
commit 97ee34980fa2a4e8aaf03b19d5bda930e602641b
Author: PÁLI Gábor János <pali.gabor at gmail.com>
AuthorDate: 2021-09-25 13:38:32 +0000
Commit: Ashish SHUKLA <ashish at FreeBSD.org>
CommitDate: 2021-09-25 20:26:07 +0000
sysutils/bhyve+: Add explicit support for 14-CURRENT
Reported by: pkg-fallout
---
sysutils/bhyve+/Makefile | 5 +++-
.../bhyve+/files/{ => freebsd-11}/patch-libvmmapi | 0
sysutils/bhyve+/files/freebsd-12/patch-libvmmapi | 33 ++++++++++++++++++++++
sysutils/bhyve+/files/freebsd-13/patch-libvmmapi | 33 ++++++++++++++++++++++
sysutils/bhyve+/files/freebsd-14/patch-bhyvectl | 12 ++++++++
sysutils/bhyve+/files/freebsd-14/patch-bhyveload | 11 ++++++++
sysutils/bhyve+/files/freebsd-14/patch-custom-libs | 21 ++++++++++++++
sysutils/bhyve+/files/freebsd-14/patch-lib9p | 12 ++++++++
sysutils/bhyve+/files/freebsd-14/patch-libvmmapi | 9 ++++++
9 files changed, 135 insertions(+), 1 deletion(-)
diff --git a/sysutils/bhyve+/Makefile b/sysutils/bhyve+/Makefile
index 266129c8bf7c..04f6642286a8 100644
--- a/sysutils/bhyve+/Makefile
+++ b/sysutils/bhyve+/Makefile
@@ -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
diff --git a/sysutils/bhyve+/files/patch-libvmmapi b/sysutils/bhyve+/files/freebsd-11/patch-libvmmapi
similarity index 100%
rename from sysutils/bhyve+/files/patch-libvmmapi
rename to sysutils/bhyve+/files/freebsd-11/patch-libvmmapi
diff --git a/sysutils/bhyve+/files/freebsd-12/patch-libvmmapi b/sysutils/bhyve+/files/freebsd-12/patch-libvmmapi
new file mode 100644
index 000000000000..16f14a57bf9a
--- /dev/null
+++ b/sysutils/bhyve+/files/freebsd-12/patch-libvmmapi
@@ -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
+
diff --git a/sysutils/bhyve+/files/freebsd-13/patch-libvmmapi b/sysutils/bhyve+/files/freebsd-13/patch-libvmmapi
new file mode 100644
index 000000000000..16f14a57bf9a
--- /dev/null
+++ b/sysutils/bhyve+/files/freebsd-13/patch-libvmmapi
@@ -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
+
diff --git a/sysutils/bhyve+/files/freebsd-14/patch-bhyvectl b/sysutils/bhyve+/files/freebsd-14/patch-bhyvectl
new file mode 100644
index 000000000000..ae14ada4fc5f
--- /dev/null
+++ b/sysutils/bhyve+/files/freebsd-14/patch-bhyvectl
@@ -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
+
diff --git a/sysutils/bhyve+/files/freebsd-14/patch-bhyveload b/sysutils/bhyve+/files/freebsd-14/patch-bhyveload
new file mode 100644
index 000000000000..616f68b1fc2c
--- /dev/null
+++ b/sysutils/bhyve+/files/freebsd-14/patch-bhyveload
@@ -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
+
diff --git a/sysutils/bhyve+/files/freebsd-14/patch-custom-libs b/sysutils/bhyve+/files/freebsd-14/patch-custom-libs
new file mode 100644
index 000000000000..8bc50391d41b
--- /dev/null
+++ b/sysutils/bhyve+/files/freebsd-14/patch-custom-libs
@@ -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
diff --git a/sysutils/bhyve+/files/freebsd-14/patch-lib9p b/sysutils/bhyve+/files/freebsd-14/patch-lib9p
new file mode 100644
index 000000000000..97f2fd5b00a7
--- /dev/null
+++ b/sysutils/bhyve+/files/freebsd-14/patch-lib9p
@@ -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"
diff --git a/sysutils/bhyve+/files/freebsd-14/patch-libvmmapi b/sysutils/bhyve+/files/freebsd-14/patch-libvmmapi
new file mode 100644
index 000000000000..d54c9340ca0c
--- /dev/null
+++ b/sysutils/bhyve+/files/freebsd-14/patch-libvmmapi
@@ -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
+
More information about the dev-commits-ports-all
mailing list