On Tue, 19 Mar 2013, Brooks Davis wrote: > > > Replace all known uses of ln in the build process with appropriate > > > install -l invocations via new INSTALL_LINK and INSTALL_SYMLINK > > > variables. > > > > It seems this merge breaks ``make distribution'' and hence mergemaster if > > your > > base system is not updated yet (for example, while updating jail): > > Sorry for the delay in responding. I missed this yesterday. > > It works for me on a older 9.0-STABLE system where the base install > doesn't support -l. Did you build world or run "make toolchain" in that > source tree to build the bootstrap copy of install?
Yes, this is after full ``make buildworld buildkernel'' process. For me, I use an obvious quick'n'dirty hack (bad, I know, but useable for me as a workaround) marck@castor:/FreeBSD/rinet/src.9.newcarp> svn diff share/mk Index: share/mk/bsd.own.mk =================================================================== --- share/mk/bsd.own.mk (revision 248523) +++ share/mk/bsd.own.mk (working copy) @@ -187,8 +187,8 @@ HRDLINK?= -l h SYMLINK?= -l s -INSTALL_LINK?= ${INSTALL} ${HRDLINK} -INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK} +INSTALL_LINK?= ln -f +INSTALL_SYMLINK?= ln -fs # Common variables .if !defined(DEBUG_FLAGS) -- Sincerely, D.Marck [DM5020, MCK-RIPE, DM3-RIPN] [ FreeBSD committer: ma...@freebsd.org ] ------------------------------------------------------------------------ *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- ma...@rinet.ru *** ------------------------------------------------------------------------ _______________________________________________ svn-src-stable-9@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9 To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"