From owner-cvs-all@FreeBSD.ORG Wed Jun 9 06:31:29 2010 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B87E1065674; Wed, 9 Jun 2010 06:31:29 +0000 (UTC) (envelope-from glewis@eyesbeyond.com) Received: from misty.eyesbeyond.com (gerbercreations.com [71.39.140.16]) by mx1.freebsd.org (Postfix) with ESMTP id CD82F8FC1B; Wed, 9 Jun 2010 06:31:28 +0000 (UTC) Received: from misty.eyesbeyond.com (localhost.eyesbeyond.com [127.0.0.1]) by misty.eyesbeyond.com (8.14.4/8.14.4) with ESMTP id o596VRip096374; Tue, 8 Jun 2010 23:31:27 -0700 (PDT) (envelope-from glewis@eyesbeyond.com) Received: (from glewis@localhost) by misty.eyesbeyond.com (8.14.4/8.14.4/Submit) id o596VQMi096373; Tue, 8 Jun 2010 23:31:26 -0700 (PDT) (envelope-from glewis@eyesbeyond.com) X-Authentication-Warning: misty.eyesbeyond.com: glewis set sender to glewis@eyesbeyond.com using -f Date: Tue, 8 Jun 2010 23:31:26 -0700 From: Greg Lewis To: "Philip M. Gollucci" Message-ID: <20100609063126.GA96306@misty.eyesbeyond.com> References: <201006082017.o58KHb1o039986@repoman.freebsd.org> <4C0EB5E8.5040009@p6m7g8.com> <20100609004757.7a61d6f6@it.buh.tecnik93.com> <20100609035149.GA94751@misty.eyesbeyond.com> <4C0F146C.3060906@p6m7g8.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4C0F146C.3060906@p6m7g8.com> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: Rob Farmer , cvs-all@FreeBSD.org, ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, glewis@FreeBSD.org, Ion-Mihai Tetcu Subject: Re: cvs commit: ports/java/jdk16 Makefile X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Jun 2010 06:31:29 -0000 On Wed, Jun 09, 2010 at 12:11:24AM -0400, Philip M. Gollucci wrote: > On 6/8/2010 11:51 PM, Greg Lewis wrote: > > The build uses the following logic to detect the presence of sigignore: > > > > ifeq ($(OS_VENDOR),FreeBSD) > > OS_RELDATE := $(shell sysctl kern.osreldate | cut -d' ' -f2) > > HAS_SIGIGNORE := $(shell if [ $(OS_RELDATE) -ge 800502 -a $(OS_RELDATE) -lt 900000 -o $(OS_RELDATE) -ge 900003 ]; then echo "1"; fi) > > ifeq ($(HAS_SIGIGNORE),1) > > override HAVE_SIGIGNORE = true > > endif > > endif > > > > Why not do something like what devel/apr1 does: > > patch the file to be %%OSVERSION%% here, then in post-patch replace that > token with the value. OSVERSION is overloaded correctly on pointyhat > and tb(hence QAT) whereas sysctl is not. > > > post-patch: > ${REINPLACE_CMD} -e 's/OSVERSION/${OSVERSION}/g' \ > ${APR_WRKDIR}/build/apr_hints.m4 Thanks. I've committed a change to do this. If someone could please let me know if you see any problems (I don't have a box which actually has a recent 8-STABLE or 9-CURRENT I can test on) that would be great. It seems to still do the right thing on versions without sigignore(3) at least. It would also be good to know if QAT is now happy with it. -- Greg Lewis Email : glewis@eyesbeyond.com Eyes Beyond Web : http://www.eyesbeyond.com Information Technology FreeBSD : glewis@FreeBSD.org