Date: Thu, 18 Apr 2002 17:33:00 +0300 From: Maxim Sobolev <sobomax@FreeBSD.org> To: Ruslan Ermilov <ru@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: <3CBED91C.3ED57B68@FreeBSD.org> References: <200204171349.g3HDnTV73622@freefall.freebsd.org> <Pine.LNX.4.44.0204171603420.26554-100000@smtp.gnf.org> <20020418080234.GF98788@sunbay.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Ruslan Ermilov wrote:
>
> On Wed, Apr 17, 2002 at 04:11:03PM -0700, Gordon Tetlow wrote:
> > On Wed, 17 Apr 2002, Ruslan Ermilov wrote:
> >
> > > ru 2002/04/17 06:49:29 PDT
> > >
> > > Modified files:
> > > share/mk bsd.doc.mk bsd.docb.mk bsd.info.mk
> > > bsd.lib.mk bsd.libnames.mk bsd.man.mk
> > > bsd.nls.mk bsd.obj.mk bsd.own.mk
> > > bsd.prog.mk bsd.sgml.mk bsd.subdir.mk
> > > sys.mk
> > > Added files:
> > > share/mk bsd.init.mk
> > > Log:
> > > Don't include bsd.own.mk from sys.mk, this makes it impossible
> > > to use ``.if defined()'' inside bsd.own.mk to test for defines
> > > in individual makefiles. For example, setting DEBUG_FLAGS in
> > > Makefile didn't take the desired effect on the STRIP assignment.
> >
> > 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?
-Maxim
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3CBED91C.3ED57B68>