svn commit: r285366 - in head: lib/libmd sys/crypto/sha2

[Warner Losh]

> On Jul 11, 2015, at 8:33 AM, Craig Rodrigues <rodrigc at crodrigues.org> wrote:
> 
> 
> 
> On Sat, Jul 11, 2015 at 10:29 AM, John-Mark Gurney <jmg at funkthat.com> wrote:
> Craig Rodrigues wrote this message on Sat, Jul 11, 2015 at 10:16 -0400:
> 
> > So it looks like _libmd_SHA256_File is not defined in the legacy
> > library used during the bootstrap.
> 
> The closest I can see is that sha256hl.c (from mdXhl.c) is including
> "sha256.h" with double quotes, and getting the wrong header file..
> 
> 
> Yes, I think you are right.
> 
> If I go to src/lib/libmd, and type:
> 
> make -V CFLAGS
> 
> I see:
> 
> -O2 -pipe   -I/builds/FreeBSD_HEAD/lib/libmd -DWEAK_REFS -std=gnu99 -Qunused-arguments  -fstack-protector -Wno-pointer-sign -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable -Wno-tautological-compare -Wno-unused-value -Wno-parentheses-equality -Wno-unused-function -Wno-enum-conversion -Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter -Wno-parentheses
> 
> After your change, there is no sha256.h file in the src/lib/libmd directory, so the bootstrap stage
> is picking up sha256.h from /usr/include , which causes problems.

You’d be better off retaining sha256.h as an empty file, or adding it to the legacy includes. But for some reason those aren’t appearing on this command line (suggesting this is built after we’re done with -legacy). If so, an empty file would likely cover many of the sins here.

I think you can add a CFLAGS.sha256hi.c=-E to get the intermediate output of the pre-processor to see exactly where this file is coming from. Or you can use the .depend file from the build to see where it was picked up from (which might be easier).

Unless you can resolve this quickly, I’d go with the blackout.

Warner


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 842 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.freebsd.org/pipermail/svn-src-head/attachments/20150711/91fbade2/attachment.bin>