Date: Wed, 29 Mar 2023 15:42:21 +0200 From: Corvin =?ISO-8859-1?Q?K=F6hne?= <corvink@FreeBSD.org> To: Mark Johnston <markj@FreeBSD.org> Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: cff482380436 - main - bhyve: Move libcasper dependecy to lib9p Message-ID: <18d0b6ee177ba4d84f0f355c06707f494e99f640.camel@FreeBSD.org> In-Reply-To: <202303071613.327GDYuO057215@gitrepo.freebsd.org> References: <202303071613.327GDYuO057215@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-HBwsCK6gBwcTCG6lpwON Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, 2023-03-07 at 16:13 +0000, Mark Johnston wrote: > The branch main has been updated by markj: >=20 > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dcff4823804363cf199c7c87eed8870a= d014066cc >=20 > commit cff4823804363cf199c7c87eed8870ad014066cc > Author:=C2=A0=C2=A0=C2=A0=C2=A0 Vitaliy Gusev <gusev.vitaliy@gmail.com> > AuthorDate: 2023-03-07 16:09:22 +0000 > Commit:=C2=A0=C2=A0=C2=A0=C2=A0 Mark Johnston <markj@FreeBSD.org> > CommitDate: 2023-03-07 16:09:22 +0000 >=20 > =C2=A0=C2=A0=C2=A0 bhyve: Move libcasper dependecy to lib9p > =C2=A0=C2=A0=C2=A0=20 > =C2=A0=C2=A0=C2=A0 libcasper(3) is not used in bhyve. So move dependency = to the > appropriate > =C2=A0=C2=A0=C2=A0 place. > =C2=A0=C2=A0=C2=A0=20 > =C2=A0=C2=A0=C2=A0 Reviewed by:=C2=A0=C2=A0=C2=A0 markj > =C2=A0=C2=A0=C2=A0 MFC after:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 1 week > =C2=A0=C2=A0=C2=A0 Sponsored by:=C2=A0=C2=A0 vStack > =C2=A0=C2=A0=C2=A0 Differential Revision:=C2=A0 https://reviews.freebsd.o= rg/D38905 > --- > =C2=A0lib/lib9p/Makefile=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 5 +++-- > =C2=A0share/mk/src.libnames.mk | 4 ++++ > =C2=A0usr.sbin/bhyve/Makefile=C2=A0 | 8 -------- > =C2=A03 files changed, 7 insertions(+), 10 deletions(-) >=20 > diff --git a/lib/lib9p/Makefile b/lib/lib9p/Makefile > index c810ccd79e64..5d3681104d8c 100644 > --- a/lib/lib9p/Makefile > +++ b/lib/lib9p/Makefile > @@ -6,8 +6,11 @@ > =C2=A0CFLAGS+=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0-I${.CURDIR} > =C2=A0CFLAGS+=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0-I${.CURDIR}/..= /../contrib/lib9p > =C2=A0 > +LIBADD=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sbuf > + > =C2=A0.if ${MK_CASPER} !=3D "no" > =C2=A0CFLAGS+=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0-DWITH_CASPER > +LIBADD+=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0casper cap_pwd cap_g= rp > =C2=A0.endif > =C2=A0 > =C2=A0LIB=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A09p > @@ -28,6 +31,4 @@ SRCS=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0connection.c \ > =C2=A0INCSDIR=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0${INCLUDEDIR}/l= ib9p > =C2=A0INCS=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= fid.h lib9p.h backend/fs.h > =C2=A0 > -LIBADD=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sbuf > - > =C2=A0.include <bsd.lib.mk> > diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk > index dd1bc78b1f1a..15971189306a 100644 > --- a/share/mk/src.libnames.mk > +++ b/share/mk/src.libnames.mk > @@ -271,6 +271,10 @@ > LIBVERIEXEC?=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0${LIBVERIEXECDIR}/libv= eriexec.a > =C2=A0# 2nd+ order consumers.=C2=A0 Auto-generating this would be better. > =C2=A0_DP_80211=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sbuf bsdxml > =C2=A0_DP_9p=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0sbuf > +.if ${MK_CASPER} !=3D "no" > +_DP_9p+=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0casper cap_pwd cap_g= rp > +.endif > + > =C2=A0# XXX: Not bootstrapped so uses host version on non-FreeBSD, so > don't use a > =C2=A0# FreeBSD-specific dependency list > =C2=A0.if ${.MAKE.OS} =3D=3D "FreeBSD" || !defined(BOOTSTRAPPING) > diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile > index bf0a17edc59e..1c679a3c1578 100644 > --- a/usr.sbin/bhyve/Makefile > +++ b/usr.sbin/bhyve/Makefile > @@ -89,14 +89,6 @@ SRCS+=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0vmm_= instruction_emul.c > =C2=A0 > =C2=A0LIBADD=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0vmmapi md = nv pthread z util sbuf cam 9p > =C2=A0 > -.if ${MK_CASPER} !=3D "no" > -LIBADD+=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0casper > -LIBADD+=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0cap_pwd > -LIBADD+=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0cap_grp > -# Temporary disable capsicum, until we integrate checkpoint code > with it. > -#CFLAGS+=3D-DWITH_CASPER > -.endif > - > =C2=A0.if ${MK_BHYVE_SNAPSHOT} !=3D "no" > =C2=A0LIBADD+=3D ucl xo > =C2=A0.endif Hi Mark, I do get build failures for my latest commits. The build log contains: /usr/local/bin/x86_64-unknown-freebsd13.1-ld: /tmp/obj/workspace/src/amd64.amd64/tmp/usr/lib/lib9p.so: undefined reference to `cap_setpassent' /usr/local/bin/x86_64-unknown-freebsd13.1-ld: /tmp/obj/workspace/src/amd64.amd64/tmp/usr/lib/lib9p.so: undefined reference to `cap_getgrgid_r' /usr/local/bin/x86_64-unknown-freebsd13.1-ld: /tmp/obj/workspace/src/amd64.amd64/tmp/usr/lib/lib9p.so: undefined reference to `cap_setgroupent' /usr/local/bin/x86_64-unknown-freebsd13.1-ld: /tmp/obj/workspace/src/amd64.amd64/tmp/usr/lib/lib9p.so: undefined reference to `cap_getpwnam' /usr/local/bin/x86_64-unknown-freebsd13.1-ld: /tmp/obj/workspace/src/amd64.amd64/tmp/usr/lib/lib9p.so: undefined reference to `cap_getpwuid_r' collect2: error: ld returned 1 exit status See https://ci.FreeBSD.org/job/FreeBSD-main-amd64-gcc12_build/701/console It seems to be related to this commit. Any ideas how to fix it? --=20 Kind regards, Corvin --=-HBwsCK6gBwcTCG6lpwON Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgvRSla3m2t/H2U9G2FTaVjFeAmoFAmQkQD0ACgkQ2FTaVjFe AmrSRQ//fKt5cZ09ApET7esqdorRSh+TXV3In3TUdHqUmWagzUkS0Ei9I7C0m7iX pt3vYMZNYYHPbjllrra8ynACvrpDHQZaltstpFR2xP1hXs1SncYmq09CHes+EzIl 6giyHNuAPH4wfXhDGyGGiojZnqidwODLz0eoP/GpdtbvCWiK2GjBfc9kSo6bPE8A xkIzaoMCv+nKQEkSP/k3jXpDmSbVYHgZIaWTCszzTuHrxPBRhHmLv+ABO0mqbkGq QYRTieP7T3N1LVPQcba+u1ds1q6RQSvQaosfKA6KuBhKEmqYstNr3BxgbZdqC56t AFRiJ5lDBMSSZbhM4SUSXiZ2suKqW0xVbIta27H8OiQe9xpyR825HNnV9cFNJNcp 2lcsfZlbtSsAvqX4aopg4cec5mKx5y9AaiIubvmM3Io0qkbF4QcqJkgvy76dI68Y rYhC+jARmxqahH0BmgJf29vVOISOarZWsVX0bj8erMYCptA8MWLBVZHXo4TxLVIH wt1FiE4DrMt+LswU2Yf18LVvnxclIKL2h9gySA9STanKN51ejmLv4W4Ap6FDyAgO MLbQKwDcPtvDAvViHSRLLjXE9XCQmX+Br4vxkNYqw1ONtPauRpFdKma5H1B1mJ0m SxGaiCvhTxVXa9ABSa5Dhmla63ZgmHkX0w/ZQvYLVPQVRp+YjYU= =y9td -----END PGP SIGNATURE----- --=-HBwsCK6gBwcTCG6lpwON--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?18d0b6ee177ba4d84f0f355c06707f494e99f640.camel>