From owner-freebsd-java@FreeBSD.ORG Mon Aug 8 19:26:36 2005 Return-Path: X-Original-To: java@freebsd.org 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 0BE1316A41F for ; Mon, 8 Aug 2005 19:26:36 +0000 (GMT) (envelope-from glewis@eyesbeyond.com) Received: from misty.eyesbeyond.com (glewis.dsl.xmission.com [166.70.56.15]) by mx1.FreeBSD.org (Postfix) with ESMTP id 699CB43D46 for ; Mon, 8 Aug 2005 19:26:35 +0000 (GMT) (envelope-from glewis@eyesbeyond.com) Received: from misty.eyesbeyond.com (localhost.eyesbeyond.com [127.0.0.1]) by misty.eyesbeyond.com (8.13.3/8.13.3) with ESMTP id j78JQU2j014894; Mon, 8 Aug 2005 13:26:30 -0600 (MDT) (envelope-from glewis@eyesbeyond.com) Received: (from glewis@localhost) by misty.eyesbeyond.com (8.13.3/8.13.3/Submit) id j78JQS4f014893; Mon, 8 Aug 2005 13:26:29 -0600 (MDT) (envelope-from glewis@eyesbeyond.com) X-Authentication-Warning: misty.eyesbeyond.com: glewis set sender to glewis@eyesbeyond.com using -f Date: Mon, 8 Aug 2005 13:26:28 -0600 From: Greg Lewis To: shudo@computer.org Message-ID: <20050808192628.GA12949@misty.eyesbeyond.com> References: <20050806165042.GG20784@xor.obsecurity.org> <20050808.232813.102581202.shudo@aist.go.jp> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="SLDf9lqlvOQaIe6s" Content-Disposition: inline In-Reply-To: <20050808.232813.102581202.shudo@aist.go.jp> User-Agent: Mutt/1.4.2.1i Cc: java@freebsd.org, kris@obsecurity.org Subject: Re: [ports-i386@FreeBSD.org: shujit-0.7.14_2 failed on i386 5] X-BeenThere: freebsd-java@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting Java to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 19:26:36 -0000 --SLDf9lqlvOQaIe6s Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, Aug 08, 2005 at 11:28:13PM +0900, shudo@computer.org wrote: > From: Kris Kennaway > > > FYI; can you please investigate and/or report to the developers? If > > you are already aware of this problem but do not yet have a fix, > > please mark the port BROKEN in the appropriate case, so that users do > > not unexpectedly encounter it. > > > > See http://pointyhat.freebsd.org for the full log. > > I've updated the software shuJIT and released a new version (0.8.0), > which can be compiled with GCC 4.0 and later. Please update the port > if someone still have an interest on it. Here is a patch which works for me. I haven't got a 6.0 box to test it on, but it works with both gcc34 and gcc40 set as the compiler. Kris, is it ok to commit this? -- Greg Lewis Email : glewis@eyesbeyond.com Eyes Beyond Web : http://www.eyesbeyond.com Information Technology FreeBSD : glewis@FreeBSD.org --SLDf9lqlvOQaIe6s Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="shutjit.diff" Index: Makefile =================================================================== RCS file: /var/fcvs/ports/java/shujit/Makefile,v retrieving revision 1.43 diff -u -r1.43 Makefile --- Makefile 15 Oct 2004 18:20:43 -0000 1.43 +++ Makefile 8 Aug 2005 18:26:30 -0000 @@ -6,8 +6,7 @@ # PORTNAME= shujit -PORTVERSION= 0.7.14 -PORTREVISION= 2 +PORTVERSION= 0.8.0 CATEGORIES= java MASTER_SITES= http://www.shudo.net/jit/dist/ Index: distinfo =================================================================== RCS file: /var/fcvs/ports/java/shujit/distinfo,v retrieving revision 1.22 diff -u -r1.22 distinfo --- distinfo 31 Mar 2004 03:08:58 -0000 1.22 +++ distinfo 8 Aug 2005 18:27:02 -0000 @@ -1,2 +1,2 @@ -MD5 (shujit-0.7.14.tar.gz) = 4590faef61fe93d013b56d47794c0da8 -SIZE (shujit-0.7.14.tar.gz) = 251026 +MD5 (shujit-0.8.0.tar.gz) = 0c4babb5ec088ed0aaeaaba8f2b9d218 +SIZE (shujit-0.8.0.tar.gz) = 272497 Index: pkg-plist =================================================================== RCS file: /var/fcvs/ports/java/shujit/pkg-plist,v retrieving revision 1.3 diff -u -r1.3 pkg-plist --- pkg-plist 16 Feb 2003 08:33:22 -0000 1.3 +++ pkg-plist 8 Aug 2005 19:05:29 -0000 @@ -1,3 +1,3 @@ lib/libshujit.so -share/doc/shujit/README -@dirrm share/doc/shujit +%%DOCSDIR%%/README +@dirrm %%DOCSDIR%% Index: files/patch-ab =================================================================== RCS file: /var/fcvs/ports/java/shujit/files/patch-ab,v retrieving revision 1.5 diff -u -r1.5 patch-ab --- files/patch-ab 10 Sep 2001 15:44:31 -0000 1.5 +++ files/patch-ab 8 Aug 2005 19:19:57 -0000 @@ -10,9 +10,9 @@ -COPTFLAGS = -O2 CFLAGS_OPT = CFLAGS_DBG = -g -DDEBUG -DJCOV --NOOPTCFLAGS = -pipe -fPIC ${CFLAGS_${VARIANT}} ${CFLAGS_COMMON} ${INCDIR} +-NOOPTCFLAGS = @ac_cflags@ -pipe ${CFLAGS_${VARIANT}} ${CFLAGS_COMMON} ${INCDIR} -CFLAGS = ${COPTFLAGS} ${NOOPTCFLAGS} -+NOOPTCFLAGS = -fPIC ${CFLAGS_${VARIANT}} ${CFLAGS_COMMON} ${INCDIR} ++NOOPTCFLAGS = @ac_cflags@ ${CFLAGS_${VARIANT}} ${CFLAGS_COMMON} ${INCDIR} +CFLAGS += ${COPTFLAGS} ${NOOPTCFLAGS} LIBS = Index: files/patch-ac =================================================================== RCS file: /var/fcvs/ports/java/shujit/files/patch-ac,v retrieving revision 1.1 diff -u -r1.1 patch-ac --- files/patch-ac 25 Sep 2000 07:32:43 -0000 1.1 +++ files/patch-ac 8 Aug 2005 19:05:00 -0000 @@ -1,10 +1,12 @@ +$FreeBSD$ + --- README 2000/09/23 21:59:50 1.1 +++ README 2000/09/23 21:59:26 @@ -33,6 +33,10 @@ * Run Java applications with JIT compiler. -+Fist you should set LD_LIBRARY_PATH enviropment variable as follows: ++First you should set LD_LIBRARY_PATH environment variable as follows: + + export LD_LIBRARY_PATH=%%PREFIX%%/lib/shujit + Index: files/patch-compiler.h =================================================================== RCS file: /var/fcvs/ports/java/shujit/files/patch-compiler.h,v retrieving revision 1.5 diff -u -r1.5 patch-compiler.h --- files/patch-compiler.h 8 Jul 2003 08:48:57 -0000 1.5 +++ files/patch-compiler.h 8 Aug 2005 19:06:37 -0000 @@ -7,7 +7,7 @@ // Additional type definition --#if !(defined(_ILP32) || defined(_LP64) || defined(_SYS_INTTYPES_H_) /* for FreeBSD */) +-#if !(defined(_ILP32) || defined(_LP64) || defined(_STDINT_H) || defined(_SYS_INTTYPES_H_) /* for FreeBSD */) +#if !(defined(_ILP32) || defined(_LP64) || defined(__FreeBSD__)) # ifndef _UINT16_T # define _UINT16_T --SLDf9lqlvOQaIe6s--