Date: Thu, 26 May 2016 23:20:41 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300807 - in head: rescue/rescue share/mk targets/pseudo/userland/misc Message-ID: <201605262320.u4QNKfGD070442@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu May 26 23:20:40 2016 New Revision: 300807 URL: https://svnweb.freebsd.org/changeset/base/300807 Log: DIRDEPS_BUILD: Fix and hookup rescue/rescue to the build. Sponsored by: EMC / Isilon Storage Division Added: head/rescue/rescue/Makefile.depend (contents, props changed) Modified: head/share/mk/bsd.crunchgen.mk head/targets/pseudo/userland/misc/Makefile.depend Added: head/rescue/rescue/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/rescue/rescue/Makefile.depend Thu May 26 23:20:40 2016 (r300807) @@ -0,0 +1,61 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + cddl/lib/libavl \ + cddl/lib/libnvpair \ + cddl/lib/libumem \ + cddl/lib/libuutil \ + cddl/lib/libzfs \ + cddl/lib/libzfs_core \ + cddl/lib/libzpool \ + gnu/lib/csu \ + gnu/lib/libgcc \ + include \ + include/arpa \ + include/protocols \ + include/rpc \ + include/rpcsvc \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/lib80211 \ + lib/libalias/libalias \ + lib/libarchive \ + lib/libbz2 \ + lib/libc \ + lib/libcam \ + lib/libcompiler_rt \ + lib/libcrypt \ + lib/libdevstat \ + lib/libedit \ + lib/libelf \ + lib/libexpat \ + lib/libgeom \ + lib/libipsec \ + lib/libjail \ + lib/libkiconv \ + lib/libkvm \ + lib/liblzma \ + lib/libmd \ + lib/libmt \ + lib/libnetgraph \ + lib/libsbuf \ + lib/libthr \ + lib/libufs \ + lib/libutil \ + lib/libxo \ + lib/libz \ + lib/msun \ + lib/ncurses/ncursesw \ + rescue/librescue \ + secure/lib/libcrypto \ + usr.bin/lex/lib \ + usr.bin/yacc.host \ + usr.sbin/crunch/crunchgen.host \ + + +.include <dirdeps.mk> + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Modified: head/share/mk/bsd.crunchgen.mk ============================================================================== --- head/share/mk/bsd.crunchgen.mk Thu May 26 23:20:36 2016 (r300806) +++ head/share/mk/bsd.crunchgen.mk Thu May 26 23:20:40 2016 (r300807) @@ -108,6 +108,7 @@ ${CONF}: Makefile CRUNCHGEN?= crunchgen CRUNCHENV+= MK_TESTS=no \ + UPDATE_DEPENDFILE=no \ _RECURSING_CRUNCH=1 .ORDER: ${OUTPUTS} objs ${OUTPUTS:[1]}: .META @@ -121,13 +122,13 @@ ${OUTPUTS}: ${CONF} # These 2 targets cannot use .MAKE since they depend on the generated # ${OUTMK} above. -${PROG}: ${OUTPUTS} objs +${PROG}: ${OUTPUTS} objs .META ${CRUNCHENV} \ CC="${CC} ${CFLAGS} ${LDFLAGS}" \ CXX="${CXX} ${CXXFLAGS} ${LDFLAGS}" \ - ${MAKE} -f ${OUTMK} exe + ${MAKE} .MAKE.MODE=normal -f ${OUTMK} exe -objs: ${OUTMK} +objs: ${OUTMK} .META ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} \ ${MAKE} -f ${OUTMK} objs @@ -163,3 +164,5 @@ clean: ${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} ${MAKE} \ -f ${OUTMK} clean; \ fi + +META_XTRAS+= ${find ${CRUNCHOBJS}${SRCTOP} -name '*.meta' 2>/dev/null || true:L:sh} Modified: head/targets/pseudo/userland/misc/Makefile.depend ============================================================================== --- head/targets/pseudo/userland/misc/Makefile.depend Thu May 26 23:20:36 2016 (r300806) +++ head/targets/pseudo/userland/misc/Makefile.depend Thu May 26 23:20:40 2016 (r300807) @@ -19,6 +19,7 @@ DIRDEPS = \ etc/newsyslog.conf.d \ etc/sendmail \ rescue/librescue \ + rescue/rescue \ .if ${MK_BOOT} != "no" DIRDEPS+= sys/boot/common
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605262320.u4QNKfGD070442>