diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2017-03-22 17:56:46 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2017-03-22 17:56:46 +0000 |
| commit | cbb38ce6a11f1fd762efbb558adbf4b370c03fe4 (patch) | |
| tree | d0cac883d24f790736c1efeec50d326a7f2023d7 | |
| parent | 6f1e2c1745b78711f7687843e16b2647dc7c7545 (diff) | |
| download | FreeBSD-src-cbb38ce6a11f1fd762efbb558adbf4b370c03fe4.zip FreeBSD-src-cbb38ce6a11f1fd762efbb558adbf4b370c03fe4.tar.gz | |
MFC r314709,r314790,r314794:
r314709:
Fix bootstrapping mtree after r313404 for older systems.
r314790:
Added comments for why nmtree/libmd are bootstrapped.
r314794:
Fix bootstrapping libmd on older systems after r314709.
PR: 217673
| -rw-r--r-- | Makefile.inc1 | 8 | ||||
| -rw-r--r-- | lib/libmd/Makefile | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 797140a..2125e20 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1583,10 +1583,14 @@ ${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd ${_bt}-usr.bin/lex: ${_bt}-usr.bin/m4 .endif -.if ${BOOTSTRAPPING} < 1000026 -_nmtree= lib/libnetbsd \ +# r245440 mtree -N support added +# r313404 requires sha384.h for libnetbsd, added to libmd in r292782 +.if ${BOOTSTRAPPING} < 1100093 +_nmtree= lib/libmd \ + lib/libnetbsd \ usr.sbin/nmtree +${_bt}-lib/libnetbsd: ${_bt}-lib/libmd ${_bt}-usr.sbin/nmtree: ${_bt}-lib/libnetbsd .endif diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile index b556ea0..f00c340 100644 --- a/lib/libmd/Makefile +++ b/lib/libmd/Makefile @@ -72,6 +72,13 @@ CLEANFILES+= md[245]hl.c md[245].ref md[245].3 mddriver \ skein256.ref skein512.ref skein1024.ref \ skeindriver +# Need src tree sys/md5.h for MD5FileChunk prototype on older systems. +SRCS+= sys/md5.h +CLEANDIRS= sys +CFLAGS+= -I. +sys/md5.h: ${SRCTOP}/sys/${.TARGET} .NOMETA + ln -sf ${.ALLSRC} ${.TARGET} + # Define WEAK_REFS to provide weak aliases for libmd symbols # # Note that the same sources are also used internally by libcrypt, |
