Re: git: 84bf2bbbecc3 - main - stand: constrain zlib/gzip CFLAGS better
- In reply to: Warner Losh : "Re: git: 84bf2bbbecc3 - main - stand: constrain zlib/gzip CFLAGS better"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 20 Jul 2022 19:23:18 UTC
On Wed, 20 Jul 2022 12:12:57 -0600 Warner Losh <imp@bsdimp.com> wrote: > On Wed, Jul 20, 2022 at 12:06 PM Warner Losh <imp@bsdimp.com> wrote: > > >> >> +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! > Well, I can say that Warner's recommended change fixes building libsa for me. Couldn't build libsa earlier today without makeing some hackey changes to dosfs.c, tftp.c and ufs.c. -- Gary Jennejohn