Date: Mon, 16 Jun 2003 09:53:20 +0200 From: Dag-Erling Smorgrav <des@ofug.org> To: Kris Kennaway <kris@obsecurity.org> Cc: java@freebsd.org Subject: Re: shujit Message-ID: <xzpof0y31cf.fsf@flood.ping.uio.no> In-Reply-To: <20030616001217.GC32125@rot13.obsecurity.org> (Kris Kennaway's message of "Sun, 15 Jun 2003 17:12:17 -0700") References: <xzpsmqbovzw.fsf@flood.ping.uio.no> <20030616001217.GC32125@rot13.obsecurity.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-=
[redirected from private mail to -java]
Kris Kennaway <kris@obsecurity.org> 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 <bsd.port.pre.mk>
-.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 <linux/version.h> // 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
--=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?xzpof0y31cf.fsf>