Date: Mon, 15 Feb 2010 18:56:07 +0200
From: Andriy Gapon <avg@icyb.net.ua>
To: Greg Lewis <glewis@eyesbeyond.com>, freebsd-java@freebsd.org
Cc: Kostik Belousov <kostikbel@gmail.com>, Bob Melson <melsonr@earthlink.net>
Subject: Re: java/143879: conflicting defines of SIGNORE in java/jdk1{5,6}
Message-ID: <4B797CA7.7050706@icyb.net.ua>
In-Reply-To: <20100214050224.GA81396@misty.eyesbeyond.com>
References: <201002140325.o1E3PXFX018935@freefall.freebsd.org> <20100214050224.GA81396@misty.eyesbeyond.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Greg, it looks like java/jdk15 should have an equivalent of this: http://www.freebsd.org/cgi/cvsweb.cgi/ports/java/jdk16/files/patch-j2se-common-Defs-bsd.gmk?sortby=date Differences between jdk15 and jdk16: 1. OS_VENDOR is spelled as !!! in jdk15 2. Not sure if the second hunk is needed in jdk15 (OPENWIN_HOME) Without that, java/jdk15 build fails on recent stable/8 (amd64 if that matters) in interrupt_md.c with an error about conflicting definitions for sigignore (static vs non-static). So this is with what I ended up (sorry for the long lines): --- /usr/obj/usr/ports/java/jdk15/work/j2se/make/common/Defs-bsd.gmk.bak 2010-02-13 12:40:09.777409660 +0200 +++ /usr/obj/usr/ports/java/jdk15/work/j2se/make/common/Defs-bsd.gmk 2010-02-15 18:09:26.281854411 +0200 @@ -423,6 +423,13 @@ else override HAVE_SIGIGNORE = false endif +ifeq ($(TRUE_PLATFORM),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 override LEX_LIBRARY = -lfl ifeq ($(STATIC_CXX),true) override LIBCXX = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic -- Andriy Gapon
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4B797CA7.7050706>