From owner-freebsd-java@FreeBSD.ORG  Mon Feb 15 16:56:36 2010
Return-Path: <owner-freebsd-java@FreeBSD.ORG>
Delivered-To: freebsd-java@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 48A73106568D
	for <freebsd-java@freebsd.org>; Mon, 15 Feb 2010 16:56:36 +0000 (UTC)
	(envelope-from avg@icyb.net.ua)
Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140])
	by mx1.freebsd.org (Postfix) with ESMTP id 8C1B38FC16
	for <freebsd-java@freebsd.org>; Mon, 15 Feb 2010 16:56:34 +0000 (UTC)
Received: from odyssey.starpoint.kiev.ua (alpha-e.starpoint.kiev.ua
	[212.40.38.101])
	by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id SAA01323;
	Mon, 15 Feb 2010 18:56:08 +0200 (EET) (envelope-from avg@icyb.net.ua)
Message-ID: <4B797CA7.7050706@icyb.net.ua>
Date: Mon, 15 Feb 2010 18:56:07 +0200
From: Andriy Gapon <avg@icyb.net.ua>
User-Agent: Thunderbird 2.0.0.23 (X11/20100211)
MIME-Version: 1.0
To: Greg Lewis <glewis@eyesbeyond.com>, freebsd-java@freebsd.org
References: <201002140325.o1E3PXFX018935@freefall.freebsd.org>
	<20100214050224.GA81396@misty.eyesbeyond.com>
In-Reply-To: <20100214050224.GA81396@misty.eyesbeyond.com>
X-Enigmail-Version: 0.95.7
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: Kostik Belousov <kostikbel@gmail.com>, Bob Melson <melsonr@earthlink.net>
Subject: Re: java/143879: conflicting defines of SIGNORE in java/jdk1{5,6}
X-BeenThere: freebsd-java@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Porting Java to FreeBSD <freebsd-java.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-java>,
	<mailto:freebsd-java-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-java>
List-Post: <mailto:freebsd-java@freebsd.org>
List-Help: <mailto:freebsd-java-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-java>,
	<mailto:freebsd-java-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Feb 2010 16:56:36 -0000


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