From owner-freebsd-java@FreeBSD.ORG Mon Jun 16 00:53:24 2003 Return-Path: Delivered-To: freebsd-java@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4686A37B401 for ; Mon, 16 Jun 2003 00:53:24 -0700 (PDT) Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31]) by mx1.FreeBSD.org (Postfix) with ESMTP id 38DFF43FAF for ; Mon, 16 Jun 2003 00:53:23 -0700 (PDT) (envelope-from des@ofug.org) Received: by flood.ping.uio.no (Postfix, from userid 2602) id A329D530F; Mon, 16 Jun 2003 09:53:21 +0200 (CEST) X-URL: http://www.ofug.org/~des/ X-Disclaimer: The views expressed in this message do not necessarily coincide with those of any organisation or company with which I am or have been affiliated. To: Kris Kennaway References: <20030616001217.GC32125@rot13.obsecurity.org> From: Dag-Erling Smorgrav Date: Mon, 16 Jun 2003 09:53:20 +0200 In-Reply-To: <20030616001217.GC32125@rot13.obsecurity.org> (Kris Kennaway's message of "Sun, 15 Jun 2003 17:12:17 -0700") Message-ID: User-Agent: Gnus/5.1001 (Gnus v5.10.1) Emacs/21.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" cc: java@freebsd.org Subject: Re: shujit X-BeenThere: freebsd-java@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting Java to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jun 2003 07:53:24 -0000 --=-=-= [redirected from private mail to -java] Kris Kennaway writes: > On Sun, Jun 15, 2003 at 11:45:39PM +0200, Dag-Erling Smorgrav wrote: > > You've marked java/shujit BROKEN for OSVERSION >= 500113, yet I've had > > no trouble at all building and running it on 5.1-RELEASE and recent > > -CURRENT. What's up? > Probably you have some stale headers on your system that are allowing > the build to spuriously succeed. You're right. I've narrowed it down to bogus code in one of the shujit headers which uses struct osigcontext instead of struct sigcontext for FreeBSD >= 4.x, and apparently struct osigcontext recently disappeared from the system headers. I don't think using struct osigcontext is correct for *any* FreeBSD version, but I haven't had a chance to test my (attached) patch on 4.x yet. Any objections to my picking up the maintainership on this port? I use it quite a bit since - unlike sobomax :) - I'm not entirely comfortable with JDK 1.4.1 yet, and shujit makes a big difference on 1.3.1's performance. DES -- Dag-Erling Smorgrav - des@ofug.org --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=shujit.diff Index: Makefile =================================================================== RCS file: /home/pcvs/ports/java/shujit/Makefile,v retrieving revision 1.39 diff -u -r1.39 Makefile --- Makefile 4 Jun 2003 22:43:29 -0000 1.39 +++ Makefile 13 Jun 2003 14:47:59 -0000 @@ -32,10 +32,6 @@ .include -.if ${OSVERSION} >= 500113 -BROKEN= "Does not compile" -.endif - post-configure: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/README Index: files/patch-compiler.h =================================================================== RCS file: /home/pcvs/ports/java/shujit/files/patch-compiler.h,v retrieving revision 1.4 diff -u -r1.4 patch-compiler.h --- files/patch-compiler.h 17 Feb 2003 15:20:08 -0000 1.4 +++ files/patch-compiler.h 16 Jun 2003 07:40:18 -0000 @@ -12,3 +12,12 @@ # ifndef _UINT16_T # define _UINT16_T typedef unsigned short uint16_t; +@@ -196,7 +196,7 @@ + # include // for kernel version + # elif defined(__FreeBSD__) || defined(__NetBSD__) + # ifdef __FreeBSD__ +-# if __FreeBSD__ >= 4 && JDK_VER < 12 ++# if __FreeBSD__ == 4 && JDK_VER < 12 + // In this case, the 3rd arg. of sig. handler is not (sigcontext *). + # define SIGCONTEXT_T struct osigcontext + # else --=-=-=--