Date: Wed, 22 Mar 2017 18:35:49 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r315731 - in stable/10: . lib/libmd Message-ID: <201703221835.v2MIZnV6049928@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Wed Mar 22 18:35:48 2017 New Revision: 315731 URL: https://svnweb.freebsd.org/changeset/base/315731 Log: 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 Modified: stable/10/Makefile.inc1 stable/10/lib/libmd/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/Makefile.inc1 ============================================================================== --- stable/10/Makefile.inc1 Wed Mar 22 18:33:50 2017 (r315730) +++ stable/10/Makefile.inc1 Wed Mar 22 18:35:48 2017 (r315731) @@ -1323,10 +1323,14 @@ ${_bt}-usr.bin/yacc: ${_bt}-lib/liby _crunch= usr.sbin/crunch .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} < 1003512 +_nmtree= lib/libmd \ + lib/libnetbsd \ usr.sbin/nmtree +${_bt}-lib/libnetbsd: ${_bt}-lib/libmd ${_bt}-usr.sbin/nmtree: ${_bt}-lib/libnetbsd .endif Modified: stable/10/lib/libmd/Makefile ============================================================================== --- stable/10/lib/libmd/Makefile Wed Mar 22 18:33:50 2017 (r315730) +++ stable/10/lib/libmd/Makefile Wed Mar 22 18:35:48 2017 (r315731) @@ -52,6 +52,13 @@ CLEANFILES+= md[245]hl.c md[245].ref md[ sha256.ref sha256hl.c sha384hl.c sha384.ref \ sha512.ref sha512hl.c sha512t256.ref sha512thl.c +# Need src tree sys/md5.h for MD5FileChunk prototype on older systems. +SRCS+= sys/md5.h +CLEANDIRS= sys +CFLAGS+= -I. +sys/md5.h: ${.CURDIR}/../../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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703221835.v2MIZnV6049928>