From owner-cvs-all@FreeBSD.ORG Mon Apr 24 22:11:06 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 93F2316A422; Mon, 24 Apr 2006 22:11:06 +0000 (UTC) (envelope-from kris@obsecurity.org) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E47D43D66; Mon, 24 Apr 2006 22:11:05 +0000 (GMT) (envelope-from kris@obsecurity.org) Received: from obsecurity.dyndns.org (elvis.mu.org [192.203.228.196]) by elvis.mu.org (Postfix) with ESMTP id 3206E1A4DAC; Mon, 24 Apr 2006 15:11:05 -0700 (PDT) Received: by obsecurity.dyndns.org (Postfix, from userid 1000) id 9310D55870; Mon, 24 Apr 2006 18:11:04 -0400 (EDT) Date: Mon, 24 Apr 2006 18:11:03 -0400 From: Kris Kennaway To: Jeremy Chadwick Message-ID: <20060424221103.GA19916@xor.obsecurity.org> References: <200604241404.k3OE49eJ074318@repoman.freebsd.org> <20060424180431.GA13567@xor.obsecurity.org> <20060424210548.GA80839@pentarou.parodius.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="3V7upXqbjpZ4EhLz" Content-Disposition: inline In-Reply-To: <20060424210548.GA80839@pentarou.parodius.com> User-Agent: Mutt/1.4.2.1i Cc: cvs-ports@FreeBSD.org, ports-committers@FreeBSD.org, "Andrey A. Chernov" , cvs-all@FreeBSD.org, Kris Kennaway Subject: Re: cvs commit: ports/graphics/png/files patch-aa X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Apr 2006 22:11:06 -0000 --3V7upXqbjpZ4EhLz Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Apr 24, 2006 at 02:05:48PM -0700, Jeremy Chadwick wrote: > On Mon, Apr 24, 2006 at 02:04:31PM -0400, Kris Kennaway wrote: > > On Mon, Apr 24, 2006 at 02:04:09PM +0000, Andrey A. Chernov wrote: > > > ache 2006-04-24 14:04:09 UTC > > >=20 > > > FreeBSD ports repository > > >=20 > > > Modified files: > > > graphics/png/files patch-aa=20 > > > Log: > > > Use NO_OBJ NO_PROFILE instead of obsoleted their variants > > > =20 > > > PR: 96244 > > > Submitted by: Jeremy Chadwick > >=20 > > Are you sure this works on old FreeBSD branches? >=20 > No, I did not test this. >=20 > Kris is right -- chances are it won't suffice for 4.x. The modified > port builds fine on my 4.x box, but obviously the ports/mk framework > is expecting NOOBJ and NOPROFILE there. I don't know of a way to > test this (not sure what NOOBJ does, and profiling is completely > disabled on all of my machines). >=20 > One solution for solving this dilemma would be to remove the NOOBJ > and NOPROFILE lines completely from ${WRKSRC}/scripts/makefile.freebsd > and utilise a check in the port Makefile for ${OSVERSION}, e.g. > something like this: >=20 > .if ${OSVERSION} < 500000 > MAKE_ARGS+=3D -DNOPROFILE -DNOOBJ > .else > MAKE_ARGS+=3D -DNO_PROFILE -DNO_OBJ > .endif Either that (with correct OSVERSION) or just specify both variants at once. Kris --3V7upXqbjpZ4EhLz Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (FreeBSD) iD8DBQFETUz3Wry0BWjoQKURAkQQAJ4pF0N6VBLnwcwRDd1VhtICtAUiFACgoSlL cxyhNCAduCx5vK4lzN24ByI= =15Cm -----END PGP SIGNATURE----- --3V7upXqbjpZ4EhLz--