From owner-svn-src-stable@FreeBSD.ORG Tue Mar 19 17:49:49 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 99204307; Tue, 19 Mar 2013 17:49:49 +0000 (UTC) (envelope-from marck@rinet.ru) Received: from woozle.rinet.ru (woozle.rinet.ru [195.54.192.68]) by mx1.freebsd.org (Postfix) with ESMTP id 1557D9A8; Tue, 19 Mar 2013 17:49:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by woozle.rinet.ru (8.14.5/8.14.5) with ESMTP id r2JHnljF057183; Tue, 19 Mar 2013 21:49:48 +0400 (MSK) (envelope-from marck@rinet.ru) Date: Tue, 19 Mar 2013 21:49:47 +0400 (MSK) From: Dmitry Morozovsky To: Brooks Davis Subject: Re: svn commit: r248352 - in stable/9: etc share/mk In-Reply-To: <20130319161239.GB80942@lor.one-eyed-alien.net> Message-ID: References: <201303152132.r2FLWfwx076672@svn.freebsd.org> <20130319161239.GB80942@lor.one-eyed-alien.net> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) X-NCC-RegID: ru.rinet X-OpenPGP-Key-ID: 6B691B03 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7 (woozle.rinet.ru [0.0.0.0]); Tue, 19 Mar 2013 21:49:48 +0400 (MSK) Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Mar 2013 17:49:49 -0000 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: marck@FreeBSD.org ] ------------------------------------------------------------------------ *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck@rinet.ru *** ------------------------------------------------------------------------