cvs commit: ports/java/jdk16 Makefile

Greg Lewis glewis at eyesbeyond.com
Wed Jun 9 06:31:29 UTC 2010


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 at eyesbeyond.com
Eyes Beyond                         Web     : http://www.eyesbeyond.com
Information Technology              FreeBSD : glewis at FreeBSD.org


More information about the cvs-ports mailing list