From owner-freebsd-openoffice@FreeBSD.ORG  Fri Dec 17 08:44:33 2004
Return-Path: <owner-freebsd-openoffice@FreeBSD.ORG>
Delivered-To: freebsd-openoffice@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DD2B416A4CE
	for <openoffice@freebsd.org>; Fri, 17 Dec 2004 08:44:33 +0000 (GMT)
Received: from satie.private.org (qclgw.qcl.t.u-tokyo.ac.jp [133.11.70.190])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C017043D48
	for <openoffice@freebsd.org>; Fri, 17 Dec 2004 08:44:32 +0000 (GMT)
	(envelope-from chat95@mac.com)
Received: from localhost (localhost [IPv6:::1])
	by satie.private.org (8.13.1/8.13.1) with ESMTP id iBH8iScl043959;
	Fri, 17 Dec 2004 17:44:29 +0900 (JST)
	(envelope-from chat95@mac.com)
Date: Fri, 17 Dec 2004 17:44:28 +0900 (JST)
Message-Id: <20041217.174428.229723037.chat95@mac.com>
To: sander.vesik@gmail.com
From: NAKATA Maho <chat95@mac.com>
In-Reply-To: <dcb2c27a04121013467eb84035@mail.gmail.com>
References: <dcb2c27a04120108305a57b4c9@mail.gmail.com>
	<20041202.151042.730570312.chat95@mac.com>
	<dcb2c27a04121013467eb84035@mail.gmail.com>
Organization: private
X-Mailer: Mew version 3.3 on XEmacs 21.4.14 (Reasonable Discussion)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
cc: openoffice@freebsd.org
Subject: Re: m62 break in sw
X-BeenThere: freebsd-openoffice@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Porting OpenOffice to FreeBSD <freebsd-openoffice.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-openoffice>,
	<mailto:freebsd-openoffice-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-openoffice>
List-Post: <mailto:freebsd-openoffice@freebsd.org>
List-Help: <mailto:freebsd-openoffice-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-openoffice>,
	<mailto:freebsd-openoffice-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Dec 2004 08:44:34 -0000

In Message-ID: <dcb2c27a04121013467eb84035@mail.gmail.com> 
Sander Vesik <sander.vesik@gmail.com> wrote:

> A hack like this makes javaldx work: 
> 
> Index: plugins/sunmajor/pluginlib/sunversion.cxx
> ===================================================================
> RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx,v
> retrieving revision 1.4
> diff -u -r1.4 sunversion.cxx
> --- plugins/sunmajor/pluginlib/sunversion.cxx   23 Jul 2004 11:52:17
> -0000     1.4
> +++ plugins/sunmajor/pluginlib/sunversion.cxx   10 Dec 2004 20:38:40 -0000
> @@ -243,7 +243,9 @@
>              m_preRelease = Rel_RC1;
>          else if (! strcmp(pCur, "rc2"))
>              m_preRelease = Rel_RC2;
> -        else if (! strcmp(pCur, "rc3"))
> +        else if (! strcmp(pCur, "p6"))
> +               return true;
> +       else if (! strcmp(pCur, "rc3"))
>              m_preRelease = Rel_RC3;
>          else
>              return false;
> 

This also works for m65. problem here was difference of -lc_r and -lpthread
introduced by recent commit of lang/gcc-ooo.

lang/gcc-ooo from the port freamwork links against -lc_r even if gcc-ooo -pthread
is specified. very weired for me :(

I'll commit this fix soon. (lofi and obrein had noticed about it)
-- NAKATA, Maho