Date: Wed, 20 Jul 2022 12:05:33 -0600 From: Warner Losh <imp@bsdimp.com> To: Dmitry Chagin <dchagin@heemeyer.club> Cc: Warner Losh <imp@freebsd.org>, src-committers <src-committers@freebsd.org>, "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>, dev-commits-src-main@freebsd.org Subject: Re: git: 84bf2bbbecc3 - main - stand: constrain zlib/gzip CFLAGS better Message-ID: <CANCZdfqGcdSzoSyJ2%2BdF4u-XdwJGPSTfmrXiOdJHvGM7=WHUhQ@mail.gmail.com> In-Reply-To: <Ytg6Noc7T8R6sLNy@heemeyer.club> References: <202207081750.268Ho5kZ066824@gitrepo.freebsd.org> <Ytg6Noc7T8R6sLNy@heemeyer.club>
next in thread | previous in thread | raw e-mail | index | archive | help
--00000000000028ffd305e4407372 Content-Type: text/plain; charset="UTF-8" Yea, I know. I proposed a change to jhb when he spotted this yesterday. The problem is that the universe building tool didn't build w/o boot. The problem is that anything at all uses stand/common as its include path. I'll fix that bigger problem later. And ZFS shouldn't unconditionally include CFLAGS, but should only do it for ZFS files. I'll fix that later. Warner On Wed, Jul 20, 2022 at 11:24 AM Dmitry Chagin <dchagin@heemeyer.club> wrote: > On Fri, Jul 08, 2022 at 05:50:05PM +0000, Warner Losh wrote: > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=84bf2bbbecc369cea6095bed7a738674b27f8d13 > > > > commit 84bf2bbbecc369cea6095bed7a738674b27f8d13 > > Author: Warner Losh <imp@FreeBSD.org> > > AuthorDate: 2022-07-08 16:29:25 +0000 > > Commit: Warner Losh <imp@FreeBSD.org> > > CommitDate: 2022-07-08 17:47:37 +0000 > > > > stand: constrain zlib/gzip CFLAGS better > > > > Define ZLIB_CFLAGS and use it only for the sources that are in ZLIB > or > > that include it. > > > > Sponsored by: Netflix > > --- > > stand/libsa/Makefile | 13 +++++++------ > > 1 file changed, 7 insertions(+), 6 deletions(-) > > > > diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile > > index b5d800c26295..09637bd5e9d4 100644 > > --- a/stand/libsa/Makefile > > +++ b/stand/libsa/Makefile > > @@ -96,9 +96,11 @@ SRCS+=${i} > > > > # decompression functionality from zlib > > .PATH: ${SRCTOP}/sys/contrib/zlib > > -CFLAGS+=-DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib > > -SRCS+= adler32.c crc32.c > > -SRCS+= infback.c inffast.c inflate.c inftrees.c zutil.c > > +ZLIB_CFLAGS=-DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib > > +.for i in adler32.c crc32.c infback.c inffast.c inflate.c inftrees.c > zutil.c > > +CFLAGS.${i}+=${ZLIB_CFLAGS} > > +SRCS+= ${i} > > +.endfor > > > > # lz4 decompression functionality > > .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/lz4 > > @@ -168,9 +170,8 @@ SRCS+= time.c > > .PATH: ${SRCTOP}/sys/ufs/ffs > > SRCS+=ffs_subr.c ffs_tables.c > > > > -CFLAGS.dosfs.c+= -I${LDRSRC} > > -CFLAGS.tftp.c+= -I${LDRSRC} > > -CFLAGS.ufs.c+= -I${LDRSRC} > ^^^^^^^^^^^^ is this correct? at least it breaks builds with > WITHOUT_LOADER_ZFS and WITHOUT_BOOT probably, see PR/260083 > > > > > > +CFLAGS.gzipfs.c+= ${ZLIB_CFLAGS} > > +CFLAGS.pkgfs.c+= ${ZLIB_CFLAGS} > > CFLAGS.bzipfs.c+= -I${SRCTOP}/contrib/bzip2 -DBZ_NO_STDIO > -DBZ_NO_COMPRESS > > > > # explicit_bzero and calculate_crc32c > --00000000000028ffd305e4407372 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr">Yea, I know. I proposed a change to jhb when he spotted th= is yesterday.<div><br></div><div>The problem is that the universe building = tool didn't build w/o boot.</div><div><br></div><div>The problem is tha= t anything at all uses stand/common as its include path. I'll fix that = bigger problem later.</div><div><br></div><div>And ZFS shouldn't uncond= itionally include CFLAGS, but should only do it for ZFS files. I'll fix= that later.</div><div><div><br></div><div>Warner</div></div></div><br><div= class=3D"gmail_quote"><div dir=3D"ltr" class=3D"gmail_attr">On Wed, Jul 20= , 2022 at 11:24 AM Dmitry Chagin <dchagin@heemeyer.club> wrote:<br></= div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;bor= der-left:1px solid rgb(204,204,204);padding-left:1ex">On Fri, Jul 08, 2022 = at 05:50:05PM +0000, Warner Losh wrote:<br> > The branch main has been updated by imp:<br> > <br> > URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3D84bf2bbbecc3= 69cea6095bed7a738674b27f8d13" rel=3D"noreferrer" target=3D"_blank">https://= cgit.FreeBSD.org/src/commit/?id=3D84bf2bbbecc369cea6095bed7a738674b27f8d13<= /a><br> > <br> > commit 84bf2bbbecc369cea6095bed7a738674b27f8d13<br> > Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org><br> > AuthorDate: 2022-07-08 16:29:25 +0000<br> > Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org><br> > CommitDate: 2022-07-08 17:47:37 +0000<br> > <br> >=C2=A0 =C2=A0 =C2=A0stand: constrain zlib/gzip CFLAGS better<br> >=C2=A0 =C2=A0 =C2=A0<br> >=C2=A0 =C2=A0 =C2=A0Define ZLIB_CFLAGS and use it only for the sources = that are in ZLIB or<br> >=C2=A0 =C2=A0 =C2=A0that include it.<br> >=C2=A0 =C2=A0 =C2=A0<br> >=C2=A0 =C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0Netflix<br> > ---<br> >=C2=A0 stand/libsa/Makefile | 13 +++++++------<br> >=C2=A0 1 file changed, 7 insertions(+), 6 deletions(-)<br> > <br> > diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile<br> > index b5d800c26295..09637bd5e9d4 100644<br> > --- a/stand/libsa/Makefile<br> > +++ b/stand/libsa/Makefile<br> > @@ -96,9 +96,11 @@ SRCS+=3D${i}<br> >=C2=A0 <br> >=C2=A0 # decompression functionality from zlib<br> >=C2=A0 .PATH: ${SRCTOP}/sys/contrib/zlib<br> > -CFLAGS+=3D-DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib<br> > -SRCS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0adler32.c crc32.c<br> > -SRCS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0infback.c inffast.c inflate.c inft= rees.c zutil.c<br> > +ZLIB_CFLAGS=3D-DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib<br> > +.for i in adler32.c crc32.c infback.c inffast.c inflate.c inftrees.c = zutil.c<br> > +CFLAGS.${i}+=3D${ZLIB_CFLAGS}<br> > +SRCS+=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0${i}<br> > +.endfor<br> >=C2=A0 <br> >=C2=A0 # lz4 decompression functionality<br> >=C2=A0 .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/lz4<br> > @@ -168,9 +170,8 @@ SRCS+=3D=C2=A0 =C2=A0 time.c<br> >=C2=A0 .PATH: ${SRCTOP}/sys/ufs/ffs<br> >=C2=A0 SRCS+=3Dffs_subr.c ffs_tables.c<br> >=C2=A0 <br> > -CFLAGS.dosfs.c+=3D -I${LDRSRC}<br> > -CFLAGS.tftp.c+=3D -I${LDRSRC}<br> > -CFLAGS.ufs.c+=3D -I${LDRSRC}<br> ^^^^^^^^^^^^ is this correct? at least it breaks builds with<br> WITHOUT_LOADER_ZFS and WITHOUT_BOOT probably, see PR/260083<br> <br> <br> <br> <br> > +CFLAGS.gzipfs.c+=3D ${ZLIB_CFLAGS}<br> > +CFLAGS.pkgfs.c+=3D ${ZLIB_CFLAGS}<br> >=C2=A0 CFLAGS.bzipfs.c+=3D -I${SRCTOP}/contrib/bzip2=C2=A0 -DBZ_NO_STDI= O -DBZ_NO_COMPRESS<br> >=C2=A0 <br> >=C2=A0 # explicit_bzero and calculate_crc32c<br> </blockquote></div> --00000000000028ffd305e4407372--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfqGcdSzoSyJ2%2BdF4u-XdwJGPSTfmrXiOdJHvGM7=WHUhQ>