Date: Sat, 29 May 2021 17:01:50 -0700 From: Jason Harmening <jason.harmening@gmail.com> To: Rebecca Cran <rebecca@bsdio.com>, "Jason A. Harmening" <jah@FreeBSD.org>, src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 54256e7954d7 - main - Fix userspace build after commit 6d3e78ad6c11 Message-ID: <802d7249-9fbf-d3da-9b70-9865e10a39c4@gmail.com> In-Reply-To: <387f2176-0cb0-fcbc-1294-f2dfc0ffa9d7@bsdio.com> References: <202105292142.14TLg7ol096256@gitrepo.freebsd.org> <387f2176-0cb0-fcbc-1294-f2dfc0ffa9d7@bsdio.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 5/29/21 4:50 PM, Rebecca Cran wrote: > On 5/29/21 3:42 PM, Jason A. Harmening wrote: >> The branch main has been updated by jah: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=54256e7954d7efeee53bd1ab4d08d0c772b55f4d >> >> >> commit 54256e7954d7efeee53bd1ab4d08d0c772b55f4d >> Author: Jason A. Harmening <jah@FreeBSD.org> >> AuthorDate: 2021-05-29 21:45:09 +0000 >> Commit: Jason A. Harmening <jah@FreeBSD.org> >> CommitDate: 2021-05-29 21:45:42 +0000 >> >> Fix userspace build after commit 6d3e78ad6c11 >> Reported by: jenkins >> --- >> sys/sys/mount.h | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/sys/sys/mount.h b/sys/sys/mount.h >> index 684d8c3eb780..6c1cd82ee84f 100644 >> --- a/sys/sys/mount.h >> +++ b/sys/sys/mount.h >> @@ -43,6 +43,8 @@ >> #include <sys/tslog.h> >> #include <sys/_mutex.h> >> #include <sys/_sx.h> >> +#else >> +#include <stdbool.h> >> #endif >> /* > > I'm seeing this error even with this commit: > > > --- lib/libprocstat__L --- > In file included from /usr/src/lib/libprocstat/msdosfs.c:51: > /usr/obj/usr/src/amd64.amd64/tmp/usr/include/sys/mount.h:765:7: error: > unknown type name 'bool' > bool *mp_busy); > ^ Yes, it turns out parts of libprocstat like to pretend they're kernel components for the purpose of including mount.h. I think this should fix it, but I'm waiting for buildworld to finish to be sure: diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 6c1cd82ee84..3c7f4b9a427 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -38,6 +38,7 @@ #include <sys/ucred.h> #include <sys/queue.h> #ifdef _KERNEL +#include <sys/types.h> #include <sys/lock.h> #include <sys/lockmgr.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?802d7249-9fbf-d3da-9b70-9865e10a39c4>