Date: Wed, 20 Jul 2022 12:20:08 -0600 From: Warner Losh <imp@bsdimp.com> To: Toomas Soome <tsoome@me.com> Cc: Dmitry Chagin <dchagin@heemeyer.club>, 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: <CANCZdfpc14U4sA2eX-SYSUC6zY7-0_nSF6AvLOH%2BLiEg08KD-w@mail.gmail.com> In-Reply-To: <CANCZdfo%2BzQuyr3M0uuBGXEE%2BMp4hiChyzqSAF8icxQwdpeWQyw@mail.gmail.com> References: <202207081750.268Ho5kZ066824@gitrepo.freebsd.org> <Ytg6Noc7T8R6sLNy@heemeyer.club> <244CD526-C7D0-4D42-9DAB-6EA690DFD3A7@me.com> <CANCZdfpdKV0%2BaAKUbdVmmCaOjvKPccE1LwUGc8VDjzYVeV-sew@mail.gmail.com> <CANCZdfo%2BzQuyr3M0uuBGXEE%2BMp4hiChyzqSAF8icxQwdpeWQyw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Wed, Jul 20, 2022 at 12:12 PM Warner Losh <imp@bsdimp.com> wrote: > > > On Wed, Jul 20, 2022 at 12:06 PM Warner Losh <imp@bsdimp.com> wrote: > >> >> >> On Wed, Jul 20, 2022 at 11:44 AM Toomas Soome <tsoome@me.com> wrote: >> >>> >>> >>> > On 20. Jul 2022, at 20:24, 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 >>> > >>> > >>> >>> No, it is not correct. >>> >> >> My change is correct, theoretically. However, there's a layering >> violation that means they are needed so it was premature. >> >> I'll fix a bandaide and do it better when I return from vacation. >> > > Doh! I don't have the right keys loaded in my ssh-agent, so I can't push > the change because the port forwarding on my router is broken and I can't > remotely login :( > > If someone could commit the change I suggested in > https://reviews.freebsd.org/D35860 that would be great! > The changes were needed, btw, to limit the scope of CFLAGS for the OpenZFS blake3.c support. However, this one scope limiting shouldn't break that. Warner > Warner > > >> Warner >> >> >>> rgds, >>> toomas >>> >>> >>> > >>> > >>> >> +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 >>> >>> [-- Attachment #2 --] <div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Jul 20, 2022 at 12:12 PM Warner Losh <<a href="mailto:imp@bsdimp.com">imp@bsdimp.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Jul 20, 2022 at 12:06 PM Warner Losh <<a href="mailto:imp@bsdimp.com" target="_blank">imp@bsdimp.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Jul 20, 2022 at 11:44 AM Toomas Soome <<a href="mailto:tsoome@me.com" target="_blank">tsoome@me.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br> <br> > On 20. Jul 2022, at 20:24, Dmitry Chagin <dchagin@heemeyer.club> wrote:<br> > <br> > 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="https://cgit.FreeBSD.org/src/commit/?id=84bf2bbbecc369cea6095bed7a738674b27f8d13" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=84bf2bbbecc369cea6095bed7a738674b27f8d13</a><br>; >> <br> >> commit 84bf2bbbecc369cea6095bed7a738674b27f8d13<br> >> Author: Warner Losh <imp@FreeBSD.org><br> >> AuthorDate: 2022-07-08 16:29:25 +0000<br> >> Commit: Warner Losh <imp@FreeBSD.org><br> >> CommitDate: 2022-07-08 17:47:37 +0000<br> >> <br> >> stand: constrain zlib/gzip CFLAGS better<br> >> <br> >> Define ZLIB_CFLAGS and use it only for the sources that are in ZLIB or<br> >> that include it.<br> >> <br> >> Sponsored by: Netflix<br> >> ---<br> >> stand/libsa/Makefile | 13 +++++++------<br> >> 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+=${i}<br> >> <br> >> # decompression functionality from zlib<br> >> .PATH: ${SRCTOP}/sys/contrib/zlib<br> >> -CFLAGS+=-DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib<br> >> -SRCS+= adler32.c crc32.c<br> >> -SRCS+= infback.c inffast.c inflate.c inftrees.c zutil.c<br> >> +ZLIB_CFLAGS=-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}+=${ZLIB_CFLAGS}<br> >> +SRCS+= ${i}<br> >> +.endfor<br> >> <br> >> # lz4 decompression functionality<br> >> .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/lz4<br> >> @@ -168,9 +170,8 @@ SRCS+= time.c<br> >> .PATH: ${SRCTOP}/sys/ufs/ffs<br> >> SRCS+=ffs_subr.c ffs_tables.c<br> >> <br> >> -CFLAGS.dosfs.c+= -I${LDRSRC}<br> >> -CFLAGS.tftp.c+= -I${LDRSRC}<br> >> -CFLAGS.ufs.c+= -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> No, it is not correct.<br></blockquote><div><br></div><div>My change is correct, theoretically. However, there's a layering violation that means they are needed so it was premature.</div><div><br></div><div>I'll fix a bandaide and do it better when I return from vacation.</div></div></div></blockquote><div><br></div><div>Doh! I don't have the right keys loaded in my ssh-agent, so I can't push the change because the port forwarding on my router is broken and I can't remotely login :(</div><div><br></div><div>If someone could commit the change I suggested in <a href="https://reviews.freebsd.org/D35860" target="_blank">https://reviews.freebsd.org/D35860</a>; that would be great!</div></div></div></blockquote><div><br></div><div>The changes were needed, btw, to limit the scope of CFLAGS for the OpenZFS blake3.c support. However, this one scope limiting shouldn't break that.</div><div><br></div><div>Warner</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div class="gmail_quote"><div>Warner</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div class="gmail_quote"><div>Warner</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> rgds,<br> toomas<br> <br> <br> > <br> > <br> >> +CFLAGS.gzipfs.c+= ${ZLIB_CFLAGS}<br> >> +CFLAGS.pkgfs.c+= ${ZLIB_CFLAGS}<br> >> CFLAGS.bzipfs.c+= -I${SRCTOP}/contrib/bzip2 -DBZ_NO_STDIO -DBZ_NO_COMPRESS<br> >> <br> >> # explicit_bzero and calculate_crc32c<br> <br> </blockquote></div></div> </blockquote></div></div> </blockquote></div></div>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfpc14U4sA2eX-SYSUC6zY7-0_nSF6AvLOH%2BLiEg08KD-w>