m62 break in sw

NAKATA Maho chat95 at mac.com
Fri Dec 17 00:44:34 PST 2004


In Message-ID: <dcb2c27a04121013467eb84035 at mail.gmail.com> 
Sander Vesik <sander.vesik at 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




More information about the freebsd-openoffice mailing list