ports/141105: java/jdk16 (and possibly jdk15) build broken after r199827

[Dima Panov]

>Number:         141105
>Category:       ports
>Synopsis:       java/jdk16 (and possibly jdk15) build broken after r199827
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 02 10:50:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Dima Panov
>Release:        FreeBSD 9.0-900002-CURRENT amd64
>Organization:
Fluffy.Khv.RU 
>Environment:


System: FreeBSD 9.0-900002-CURRENT #0: Wed Dec  2 05:03:55 VLAT 2009
    root at Fluffy.Khv.RU:/usr/obj/usr/src/sys/Spot



>Description:


java/jdk16 (and possibly jdk15 and other ports) build broken since r199827, which implements sighold, sigignore, sigpause, sigrelse, sigset functions from SUSv4 XSI.
But jdk patchset (bsd-jdk-patches) provide own realization of sigignore() for FreeBSD, and use system sigignore oly on NetBSD.

Patch uses osreldate >= 900002, cause r199827 not bumped osreldate, it need to be corrected.


>How-To-Repeat:


update to r199827 or later, try to build java/jdk16


>Fix:


--- jdk16.diff begins here ---
diff -urN /zroot/a/FreeBSD/Work/ports/java/jdk16/Makefile java/jdk16/Makefile
--- /zroot/a/FreeBSD/Work/ports/java/jdk16/Makefile	2009-11-09 08:48:33.000000000 +1000
+++ java/jdk16/Makefile	2009-12-02 19:47:56.198739813 +1000
@@ -284,6 +284,10 @@
 		${BZIP2_CMD} -dc ${DISTDIR}/${PATCHSETFILE} | ${TAR} -xf - && \
 		${CHMOD} -R u+w * && \
 		${PATCH} -p0 < ${WRKDIR}/jdk16.patches
+.if (${OSVERSION} >= 900002)
+	@cd ${WRKDIR} &&  \
+		${PATCH} -p2 < ${FILESDIR}/extrapatch-j2se-make-common-Defs-bsd.gmk
+.endif
 
 post-patch:
 	@for file in ${LOCAL_FILES}; do \
diff -urN /zroot/a/FreeBSD/Work/ports/java/jdk16/files/extrapatch-j2se-make-common-Defs-bsd.gmk java/jdk16/files/extrapatch-j2se-make-common-Defs-bsd.gmk
--- /zroot/a/FreeBSD/Work/ports/java/jdk16/files/extrapatch-j2se-make-common-Defs-bsd.gmk	1970-01-01 10:00:00.000000000 +1000
+++ java/jdk16/files/extrapatch-j2se-make-common-Defs-bsd.gmk	2009-12-02 19:47:33.410582100 +1000
@@ -0,0 +1,11 @@
+--- ../../j2se/make/common/Defs-bsd.gmk.orig	2009-12-02 17:58:29.000000000 +1000
++++ ../../j2se/make/common/Defs-bsd.gmk	2009-12-02 18:50:16.981367494 +1000
+@@ -311,7 +311,7 @@
+ override HAVE_FILIOH             = false
+ override HAVE_GETHRTIME          = false
+ override HAVE_GETHRVTIME         = false
+-ifeq ($(OS_VENDOR),NetBSD)
++ifeq ($(OS_VENDOR),FreeBSD)
+ override HAVE_SIGIGNORE          = true
+ endif
+ ifeq ($(OS_VENDOR),Apple)
--- jdk16.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: