svn commit: r282726 - head/lib/libmd

[Ian Lepore]

On Sun, 2015-05-10 at 16:26 +0200, Thomas Quinot wrote:
> * Ian Lepore, 2015-05-10 :
> 
> > This appears to break bootstrapping, at least when cross-building ARM on
> > a 10-stable build host.  The build runs for about 15 seconds before
> > hitting...
> > 
> > --- _bootstrap-tools-usr.bin/xinstall ---
> > xinstall.o: In function `install':
> > /local/build/staging/freebsd/wand/src/usr.bin/xinstall/xinstall.c:(.text+0xdff): undefined reference to `_libmd_MD5File'
> > /local/build/staging/freebsd/wand/src/usr.bin/xinstall/xinstall.c:(.text+0x12ee): undefined reference to `_libmd_MD5Init'
> > /local/build/staging/freebsd/wand/src/usr.bin/xinstall/xinstall.c:(.text+0x12fa): undefined reference to `_libmd_RIPEMD160_File'
> > [quite a few more symbols listed]
> > 
> > Complete log is here (command includes -DNO_CLEAN, but objdir started out empty).
> > 
> >   http://pastebin.com/v3iSZpSJ
> 
> Thanks for your report Ian. Could you please try the patch below?
> 
> Thomas.
> 
> Index: Makefile.inc1
> ===================================================================
> --- Makefile.inc1	(révision 282726)
> +++ Makefile.inc1	(copie de travail)
> @@ -1361,6 +1361,9 @@
>  .ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g}
>  .endif
>  
> +# Rebuild up-to-date libmd for xinstall
> +${_bt}-usr.bin/xinstall: ${_bt}-lib/libmd
> +
>  bootstrap-tools: .PHONY
>  
>  #	Please document (add comment) why something is in 'bootstrap-tools'.

That gets past the bootstrapping problem, now it dies like this:

--- lib/libcrypt__L ---
--- crypt-md5.So ---
cc  -fpic -DPIC  -O -pipe   -I/local/build/staging/freebsd/wand/src/lib/libcrypt/../libmd -I/local/build/staging/freebsd/wand/src/lib/libcrypt/../libutil -I/local/build/staging/freebsd/wand/src/lib/libcrypt -DHAS_DES -DHAS_BLOWFISH -DMD4Init=__MD4Init -DMD4Final=__MD4Final -DMD4Update=__MD4Update -DMD4Pad=__MD4Pad -DMD5Init=__MD5Init -DMD5Final=__MD5Final -DMD5Update=__MD5Update -DMD5Pad=__MD5Pad -DSHA256_Init=__SHA256_Init -DSHA256_Final=__SHA256_Final -DSHA256_Update=__SHA256_Update -DSHA512_Init=__SHA512_Init -DSHA512_Final=__SHA512_Final -DSHA512_Update=__SHA512_Update -std=gnu99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -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-unused-local-typedef -Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter -Qunused-arguments -c /local/build/staging/freebsd/wand/src/lib/libcrypt/crypt-md5.c -o crypt-md5.So

[...]

--- lib/libcrypt__L ---
In file included from /local/build/staging/freebsd/wand/src/lib/libcrypt/crypt-md5.c:33:
/local/build/staging/freebsd/wand/src/lib/libcrypt/../libmd/md5.h:10:9: warning: 'MD5Init' macro redefined [-Wmacro-redefined]
#define MD5Init         _libmd_MD5Init
        ^
<command line>:8:9: note: previous definition is here
#define MD5Init __MD5Init
        ^

-- Ian