Date: Fri, 19 Apr 2002 10:35:08 +0300 From: Ruslan Ermilov <ru@FreeBSD.org> To: Maxim Sobolev <sobomax@FreeBSD.org> Cc: Gordon Tetlow <gordont@gnf.org>, portmgr@FreeBSD.org, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: [PATCH] bsd.port.mk is broken Message-ID: <20020419073508.GC53150@sunbay.com> In-Reply-To: <3CBEEF11.42410689@FreeBSD.org> References: <200204171349.g3HDnTV73622@freefall.freebsd.org> <Pine.LNX.4.44.0204171603420.26554-100000@smtp.gnf.org> <20020418080234.GF98788@sunbay.com> <3CBED91C.3ED57B68@FreeBSD.org> <20020418152443.GB79334@sunbay.com> <3CBEEF11.42410689@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Thu, Apr 18, 2002 at 07:06:41PM +0300, Maxim Sobolev wrote:
> Ruslan Ermilov wrote:
> [snip]
> > > > >
> > > > > This broke any port that uses HAS_CONFIGURE (or USE_CONFIGURE, or
> > > > > whatever), which adds into the environment INSTALL="/usr/bin/install -c -o
> > > > > ${BINOWN} -g ${BINGRP}" which are now undefined now that sys.mk no longer
> > > > > includes bsd.own.mk
> > > > >
> > > > Yeah, it did. Could someone from portmgr@ please commit this patch?
> > > >
> > > > %%%
> > > > Index: bsd.port.mk
> > > > ===================================================================
> > > > RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
> > > > retrieving revision 1.409
> > > > diff -u -r1.409 bsd.port.mk
> > > > --- bsd.port.mk 4 Apr 2002 10:06:00 -0000 1.409
> > > > +++ bsd.port.mk 18 Apr 2002 07:59:17 -0000
> > > > @@ -628,6 +628,9 @@
> > > > PORTOBJFORMAT!= test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
> > > > .endif
> > > >
> > > > +# Get system defaults.
> > > > +.include <bsd.own.mk>
> > > > +
> > > > MASTERDIR?= ${.CURDIR}
> > > >
> > > > # If they exist, include Makefile.inc, then architecture/operating
> > > > %%%
> > >
> > > Will it affect 4-STABLE?
> > >
> > Only after I MFC this stuff.
>
> Mmm, looks like you misunderstood my question or I misformulated it.
> What I meant is: whether or not bsd.port.mk with your change will have
> any problems on a -STABLE systems without your bsd.xxx.mk stuff MFCed?
> As you might know, ports tree isn't branched, so we have to ensure
> that *the same* bsd.port.mk does work both on -stable and -current.
>
Ah ok, it should be safe with RELENG_4 share/mk. It's harmless to
".include <bsd.own.mk>" twice, and I will MFC the guard for this
shortly.
Cheers,
--
Ruslan Ermilov Sysadmin and DBA,
ru@sunbay.com Sunbay Software AG,
ru@FreeBSD.org FreeBSD committer,
+380.652.512.251 Simferopol, Ukraine
http://www.FreeBSD.org The Power To Serve
http://www.oracle.com Enabling The Information Age
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (FreeBSD)
Comment: For info see http://www.gnupg.org
iD8DBQE8v8isUkv4P6juNwoRAqKlAJ9JeoXXzxI7gGTgaue4kMy7O5g9vwCeN9Xe
/4jKL1PPyEEwWOa8t+743ig=
=UywR
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020419073508.GC53150>