Date: Sat, 11 Jul 2015 22:46:55 -0700 From: John-Mark Gurney <jmg@funkthat.com> To: Andrew Turner <andrew@fubar.geek.nz> Cc: Craig Rodrigues <rodrigc@crodrigues.org>, "src-committers@freebsd.org" <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> Subject: Re: svn commit: r285366 - in head: lib/libmd sys/crypto/sha2 Message-ID: <20150712054655.GF8523@funkthat.com> In-Reply-To: <20150711180615.52a618b7@bender.Home> References: <201507110312.t6B3CZBv081280@repo.freebsd.org> <20150711080439.GD8523@funkthat.com> <CAG=rPVcCSzHKwqyOzAZOG=N9pBMpwFbY%2BCMOM655BanjnNVQ-w@mail.gmail.com> <20150711142920.GE8523@funkthat.com> <20150711180615.52a618b7@bender.Home>
next in thread | previous in thread | raw e-mail | index | archive | help
Andrew Turner wrote this message on Sat, Jul 11, 2015 at 18:06 +0100:
> On Sat, 11 Jul 2015 07:29:20 -0700
> John-Mark Gurney <jmg@funkthat.com> wrote:
> ...
> > 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..
>
> I concur, the following fixes libmd to use the correct header.
Andrew, thanks for the fix and thanks Craig for the commit... I owe
all of you a beer (or a drink of your choice)...
> Index: lib/libmd/Makefile
> ===================================================================
> --- lib/libmd/Makefile (revision 285383)
> +++ lib/libmd/Makefile (working copy)
> @@ -49,6 +49,7 @@
> # * macros are used to rename symbols to libcrypt internal names
> # * no weak aliases are generated
> CFLAGS+= -I${.CURDIR} -DWEAK_REFS
> +CFLAGS+= -I${.CURDIR}/../../sys/crypto/sha2
> .PATH: ${.CURDIR}/${MACHINE_ARCH} ${.CURDIR}/../../sys/crypto/sha2
>
> .if exists(${MACHINE_ARCH}/sha.S)
--
John-Mark Gurney Voice: +1 415 225 5579
"All that I will do, has been done, All that I have, has not."
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150712054655.GF8523>