From nobody Tue Apr 26 13:17:23 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5E4141AAB637; Tue, 26 Apr 2022 13:17:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Knj9027c3z4qfJ; Tue, 26 Apr 2022 13:17:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650979044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ugPZtNKSJ7RUXYjCJrj4JdVUeKBbOZ7s6Khmvuc7McU=; b=VvkeP7/pS2/JvScDNa1ABhQRI3wmYFeX7EYUngIso+zvTieK7aEVqxUvDFNyHuzdQHTR1a QqPUkImX5G3R8vh5X+fTaXVouxi3FewRovbfu4mX+Goh6pkMKfvXMuj+LceG/80RxzWTkA m2o9U/tihhKDOWTNCM9w6Qk3O/NQpodfuufiqdkthziw24rTDkvf76yg/T66bpXK6DDoNW jLDqxkM/SPv8APkPuj8N3Zsku3LZhDU0vlA1CqLhAu4/3aI9UHm3kyxOhjbVSWXVbvgeBb ljtaOQuY7eiK2s7uVLBHPGntDTCQlVKKvkYuXDt7dV/Wr/2MUpcmjvJ3Iqm8cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 14D087AA5; Tue, 26 Apr 2022 13:17:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23QDHNZY086523; Tue, 26 Apr 2022 13:17:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23QDHNfh086522; Tue, 26 Apr 2022 13:17:23 GMT (envelope-from git) Date: Tue, 26 Apr 2022 13:17:23 GMT Message-Id: <202204261317.23QDHNfh086522@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Ashish SHUKLA Subject: git: 07b536b871ab - 2022Q2 - sysutils/bhyve+: Fix build on 14-CURRENT and 13.1-RELEASE List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: 07b536b871ab054a2cc0fd6448e27d65068457f7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650979044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ugPZtNKSJ7RUXYjCJrj4JdVUeKBbOZ7s6Khmvuc7McU=; b=vNNMw6Bz+fgcrfa3w9HZDxMT5zTk79J6CI/q7XD9JIdP58eRaujbdeLz1wCc9lA0Iqu98s j8vsy55hf14YoC/ANaAVEVE4b6iinnEAVHUhURKw8zbxUqtGAOzSHqXYMzzB3ppxyT3Ad4 qRC7dVuZZ4tx6PMEFCIGk7NgsaMG0UOIIyLYMHLix1iCxYzmecSogwZ6i3lvWtp/HBaTdK qrHEoevL3XBPcqgwn5Wj2rRt+1VMvrSrHfSsD3nQ8aeBaa2/oq2SWTJq4ZQhzo+rK9TPFk lwdrIslnOTgDgLOKJAbeztl2uMeC2mxLLue18kX7YuK78Io87mvQBgM9XV9lwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650979044; a=rsa-sha256; cv=none; b=XHy+N5W+E77cWvWwXGitPifFtbPc1FsIUCle1Q1V/hD370vL3gz02Tqi9Qe5hvlHBGoxRY gdG2wX/NYYKUSKYx5VT9tcjqW7pbB4ZfAfZXRotxiwXQccMyaQ4iMiVEJsaan1TVKLOfqL 4PHXuyEr1Ldt98+wYucYD61MBHsmkMTARa0JzJoSmQNmiZ88T93Efpde3OZFUYcYRetl+W jJblUFCkAbYrEaspN45iTG8RQLrJqYuxATyIV+Plxt+HNM/5X4w+Ot1/Qpj0ExgTFpSNoA u4Ag/qw0+odGgqNsi9erJk2zsanRzvSJ7DRbQX7JiBNhn7AitgYEEI+HBEzKqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=07b536b871ab054a2cc0fd6448e27d65068457f7 commit 07b536b871ab054a2cc0fd6448e27d65068457f7 Author: PÁLI Gábor János AuthorDate: 2022-04-26 01:06:08 +0000 Commit: Ashish SHUKLA CommitDate: 2022-04-26 13:16:46 +0000 sysutils/bhyve+: Fix build on 14-CURRENT and 13.1-RELEASE Reported by: pkg-fallout MFH: 2022Q2 (cherry picked from commit df1f981df36889224517d232228c417be13d7934) --- sysutils/bhyve+/Makefile | 9 ++++-- .../files/freebsd-13/{ => 0}/patch-custom-libs | 0 .../bhyve+/files/freebsd-13/{ => 0}/patch-lib9p | 0 .../files/freebsd-13/{ => 0}/patch-libvmmapi | 0 .../files/freebsd-13/{ => 0}/patch-msi-x-mappings | 0 .../bhyve+/files/freebsd-13/1/patch-custom-libs | 21 +++++++++++++ sysutils/bhyve+/files/freebsd-13/1/patch-lib9p | 12 ++++++++ sysutils/bhyve+/files/freebsd-13/1/patch-libvmmapi | 34 ++++++++++++++++++++++ 8 files changed, 73 insertions(+), 3 deletions(-) diff --git a/sysutils/bhyve+/Makefile b/sysutils/bhyve+/Makefile index d418e71834f0..920d250e3171 100644 --- a/sysutils/bhyve+/Makefile +++ b/sysutils/bhyve+/Makefile @@ -18,7 +18,8 @@ SRCS= ${SRC_BASE}/sys/modules/vmm \ ${SRC_BASE}/usr.sbin/bhyve \ ${SRC_BASE}/usr.sbin/bhyvectl \ ${SRC_BASE}/usr.sbin/bhyveload \ - ${SRC_BASE}/share/mk + ${SRC_BASE}/share/mk \ + ${SRC_BASE}/contrib/bmake/mk .for _src in ${SRCS} . if !exists(${_src}) && empty(IGNORE) @@ -35,8 +36,10 @@ USE_LDCONFIG= yes .if 1200000 <= ${OSVERSION} && ${OSVERSION} < 1300000 EXTRA_PATCHES= ${PATCHDIR}/freebsd-12 ${PATCHDIR}/freebsd-12/3 -.elif 1300000 <= ${OSVERSION} && ${OSVERSION} < 1400000 -EXTRA_PATCHES= ${PATCHDIR}/freebsd-13 +.elif 1300000 <= ${OSVERSION} && ${OSVERSION} < 1301000 +EXTRA_PATCHES= ${PATCHDIR}/freebsd-13/0 +.elif 1301000 <= ${OSVERSION} && ${OSVERSION} < 1400000 +EXTRA_PATCHES= ${PATCHDIR}/freebsd-13/1 .elif 1400000 <= ${OSVERSION} && ${OSVERSION} < 1500000 EXTRA_PATCHES= ${PATCHDIR}/freebsd-14 .else diff --git a/sysutils/bhyve+/files/freebsd-13/patch-custom-libs b/sysutils/bhyve+/files/freebsd-13/0/patch-custom-libs similarity index 100% rename from sysutils/bhyve+/files/freebsd-13/patch-custom-libs rename to sysutils/bhyve+/files/freebsd-13/0/patch-custom-libs diff --git a/sysutils/bhyve+/files/freebsd-13/patch-lib9p b/sysutils/bhyve+/files/freebsd-13/0/patch-lib9p similarity index 100% rename from sysutils/bhyve+/files/freebsd-13/patch-lib9p rename to sysutils/bhyve+/files/freebsd-13/0/patch-lib9p diff --git a/sysutils/bhyve+/files/freebsd-13/patch-libvmmapi b/sysutils/bhyve+/files/freebsd-13/0/patch-libvmmapi similarity index 100% rename from sysutils/bhyve+/files/freebsd-13/patch-libvmmapi rename to sysutils/bhyve+/files/freebsd-13/0/patch-libvmmapi diff --git a/sysutils/bhyve+/files/freebsd-13/patch-msi-x-mappings b/sysutils/bhyve+/files/freebsd-13/0/patch-msi-x-mappings similarity index 100% rename from sysutils/bhyve+/files/freebsd-13/patch-msi-x-mappings rename to sysutils/bhyve+/files/freebsd-13/0/patch-msi-x-mappings diff --git a/sysutils/bhyve+/files/freebsd-13/1/patch-custom-libs b/sysutils/bhyve+/files/freebsd-13/1/patch-custom-libs new file mode 100644 index 000000000000..cee70aee6367 --- /dev/null +++ b/sysutils/bhyve+/files/freebsd-13/1/patch-custom-libs @@ -0,0 +1,21 @@ +--- usr.sbin/bhyve/Makefile.orig 2022-04-26 00:11:28.231312000 +0000 ++++ usr.sbin/bhyve/Makefile 2022-04-26 00:12:31.807022000 +0000 +@@ -3,7 +3,7 @@ + # + + .include +-CFLAGS+=-I${.CURDIR}/../../contrib/lib9p ++CFLAGS+=-I${SRCTOP}/contrib/lib9p + CFLAGS+=-I${SRCTOP}/sys + .PATH: ${SRCTOP}/sys/cam/ctl + +@@ -84,7 +84,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= ../../contrib/lib9p/lib9p.so.1.1 ../../lib/libvmmapi/libvmmapi.so.5.1 + + .if ${MK_CASPER} != "no" + LIBADD+= casper diff --git a/sysutils/bhyve+/files/freebsd-13/1/patch-lib9p b/sysutils/bhyve+/files/freebsd-13/1/patch-lib9p new file mode 100644 index 000000000000..b60692f4f5a5 --- /dev/null +++ b/sysutils/bhyve+/files/freebsd-13/1/patch-lib9p @@ -0,0 +1,12 @@ +--- share/mk/src.libnames.mk.orig 2022-04-26 00:33:13.464870000 +0000 ++++ share/mk/src.libnames.mk 2022-04-26 00:34:36.615330000 +0000 +@@ -265,6 +265,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 + # 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) diff --git a/sysutils/bhyve+/files/freebsd-13/1/patch-libvmmapi b/sysutils/bhyve+/files/freebsd-13/1/patch-libvmmapi new file mode 100644 index 000000000000..5bb87bd36d46 --- /dev/null +++ b/sysutils/bhyve+/files/freebsd-13/1/patch-libvmmapi @@ -0,0 +1,34 @@ +--- usr.sbin/bhyvectl/Makefile.orig 2022-04-26 00:35:36.192928000 +0000 ++++ usr.sbin/bhyvectl/Makefile 2022-04-26 00:36:35.181368000 +0000 +@@ -10,7 +10,8 @@ + + MAN= bhyvectl.8 + +-LIBADD= vmmapi util ++LIBADD= util ++LDADD= ../../lib/libvmmapi/libvmmapi.so.5.1 + + WARNS?= 3 + +--- usr.sbin/bhyveload/Makefile.orig 2022-04-26 00:36:44.251099000 +0000 ++++ usr.sbin/bhyveload/Makefile 2022-04-26 00:37:15.919627000 +0000 +@@ -5,7 +5,7 @@ + MAN= bhyveload.8 + PACKAGE= bhyve + +-LIBADD= vmmapi ++LDADD= ../../lib/libvmmapi/libvmmapi.so.5.1 + + WARNS?= 3 + +--- lib/libvmmapi/Makefile.orig 2022-04-26 00:37:35.557718000 +0000 ++++ lib/libvmmapi/Makefile 2022-04-26 00:38:23.135897000 +0000 +@@ -5,6 +5,8 @@ + SRCS= vmmapi.c vmmapi_freebsd.c + INCS= vmmapi.h + ++SHLIB_MAJOR?= 5.1 ++ + LIBADD= util + + CFLAGS+= -I${.CURDIR}