Re: build failure in libz

[Rin Okuyama <rokuyama.rk%gmail.com@localhost>]

Hi,

It seems that files in the following directories are rolled back to
rev 1.x after removing & re-adding to phil-wifi branch:

src/common/dist/zlib
src/crypto/external/bsd/heimdal
src/crypto/dist/ipsec-tools

For example for src/common/dist/zlib/inflate.h, 1.1 is checked out
whereas 1.1.1.2 should be.

I don't understand why commits to phil-wifi affected to -HEAD...

Thanks,
rin

On 2020/04/22 7:41, Thomas Klausner wrote:
> Hi!
>
> I'm running a userland from 2020-04-12/amd64 when NetBSD built fine for me.
>
> When I try building NetBSD-current now, it fails in libz with:
>
>
> #   compile  libz/infback.o
> gcc -O2   -std=gnu99    -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wno-sign-compare  -Wsystem-headers   -Wno-traditional   -Wa,--fatal-warnings  -Wreturn-type -Wswitch -Wshadow -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter -Wno-sign-compare -Werror   -fPIE -fstack-protector -Wstack-protector   --param ssp-buffer-size=1    -I/usr/src/common/dist/zlib  -D_FORTIFY_SOURCE=2 -c -
> Wno-error=implicit-fallthrough   /usr/src/common/dist/zlib/infback.c -o infback.o
> /usr/src/common/dist/zlib/infback.c: In function ‘inflateBackInit_’:
> /usr/src/common/dist/zlib/infback.c:69:12: error: ‘struct inflate_state’ has no member named ‘wnext’; did you mean ‘next’?
>       state->wnext = 0;
>              ^~~~~
>              next
> /usr/src/common/dist/zlib/infback.c: In function ‘inflateBack’:
> /usr/src/common/dist/zlib/infback.c:481:25: warning: this statement may fall through [-Wimplicit-fallthrough=]
>               state->mode = LEN;
>               ~~~~~~~~~~~~^~~~~
> /usr/src/common/dist/zlib/infback.c:483:9: note: here
>           case LEN:
>           ^~~~
> *** Error code 1
>
>
> And
>
> /usr/src/common/dist/zlib/inflate.c: In function 'inflateMark':
> /usr/src/common/dist/zlib/inflate.c:1559:47: error: 'struct inflate_state' has no member named 'back'
>       return (long)(((unsigned long)((long)state->back)) << 16) +
>                                                 ^~
> /usr/src/common/dist/zlib/inflate.c:1561:44: error: 'struct inflate_state' has no member named 'was'; did you mean 'last'?
>               (state->mode == MATCH ? state->was - state->length : 0));
>                                              ^~~
>                                              last
>
> I don't see a mail about this from the build bots, and I don't see any
> relevant changes between April 12 and today (about an hour ago) that'd
> explain it.
>
> Any ideas?
>   Thomas