Date: Sun, 28 Sep 2008 16:11:10 +0400 From: Eygene Ryabinkin <rea-fbsd@codelabs.ru> To: Maksim Yevmenkin <maksim.yevmenkin@gmail.com> Cc: freebsd-current@freebsd.org, dougb@freebsd.org Subject: Re: mergemaster broken Message-ID: <jJlCq0ojwnpdGNTywGuwPz0vEt8@jDDGiF%2BUOTKHtefK%2ByxHRoLasP8> In-Reply-To: <8mjnlfjxki8xBLJGjaWITKbl%2BtA@Nv45r0f9gWT8HCu35qu0Xm2Zg98> References: <bb4a86c70809261001l543f1c58q3567afa6bbae0070@mail.gmail.com> <8mjnlfjxki8xBLJGjaWITKbl%2BtA@Nv45r0f9gWT8HCu35qu0Xm2Zg98>
next in thread | previous in thread | raw e-mail | index | archive | help
--h31gzZEtNLTqOjlF
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Me again.
Sat, Sep 27, 2008 at 02:45:12PM +0400, Eygene Ryabinkin wrote:
> This is not very clean, so I had created a quick patch for mergemaster
> (from -STABLE, have no -CURRENT at hand just now, sorry). It enables
> all 'make' invocations to search /usr/src/share/mk prior to look for
> includes in /usr/share/mk. Works for my quick testing, but there can be
> some rough points I had not noticed. Please, try it.
Just verified the patch on -CURRENT -- works for me and cures your
problem, if I am using bsd.own.mk rev 1.77 during the run of the
mergemaster.
--=20
Eygene
_ ___ _.--. #
\`.|\..----...-'` `-._.-'_.-'` # Remember that it is hard
/ ' ` , __.--' # to read the on-line manual =20
)/' _/ \ `-_, / # while single-stepping the kernel.
`-'" `"\_ ,_.-;_.-\_ ', fsc/as #
_.-'_./ {_.' ; / # -- FreeBSD Developers handbook=20
{_.-``-' {_/ #
--h31gzZEtNLTqOjlF
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (FreeBSD)
iEYEARECAAYFAkjfdF4ACgkQthUKNsbL7YhXGACeLNZFXDoyVbyzFJ4+HSZeTFDg
j/oAoJW4uxA9ikz1SaRiwzqNoC6Y621A
=805Z
-----END PGP SIGNATURE-----
--h31gzZEtNLTqOjlF--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?jJlCq0ojwnpdGNTywGuwPz0vEt8>