From owner-freebsd-openoffice@FreeBSD.ORG  Sat Feb 14 18:37:57 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 C85AB16A4CE; Sat, 14 Feb 2004 18:37:57 -0800 (PST)
Received: from debussy.private.org (25.60.138.210.bn.2iij.net [210.138.60.25])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 4558143D1D; Sat, 14 Feb 2004 18:37:57 -0800 (PST)
	(envelope-from chat95@mbox.kyoto-inet.or.jp)
Received: from localhost (localhost [127.0.0.1])
	by debussy.private.org (8.12.10/8.12.10) with ESMTP id i1F2gGGm005633;
	Sun, 15 Feb 2004 11:42:17 +0900 (JST)
	(envelope-from chat95@mbox.kyoto-inet.or.jp)
Date: Sun, 15 Feb 2004 11:42:16 +0900 (JST)
Message-Id: <20040215.114216.846933633.chat95@mbox.kyoto-inet.or.jp>
To: adamw@FreeBSD.org
From: Nakata Maho <chat95@mbox.kyoto-inet.or.jp>
In-Reply-To: <20040214161442.GT3365@toxic.magnesium.net>
References: <20040214152312.GR3365@toxic.magnesium.net>
	<200402141608.i1EG8tiA078987@sakura.ninth-nine.com>
	<20040214161442.GT3365@toxic.magnesium.net>
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: nork@FreeBSD.org
cc: openoffice@FreeBSD.org
Subject: Re: patch-config_office (NOTE for submitting patches)
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: Sun, 15 Feb 2004 02:37:57 -0000

Hi adam
thank you very much for notifying me recent changes
of the way treating threads.

My stance for OOo patches is that they should be integrated
into OOo main tree. to do so, we must sign to JCA(joint
copyright assignment) mbr and maho have already signed. 

so if i went wrong, please *do not* submit patch.
please say something `this description is wrong' or something.

> Edit ports/openoffice-1.1/files/patch-config_office and change
> PTHREAD_LIBS="-lc_r"
> to
> PTHREAD_LIBS="-lpthread"
> 
> To me, this fix is painfully obvious, and I would love to have others
> test this out too. Please give that a shot and see if it fixes the build
> for you too.

According to /usr/ports/Mk/bsd.port.mk,

.if ${OSVERSION} < 500016
PTHREAD_CFLAGS?=        -D_THREAD_SAFE
PTHREAD_LIBS?=          -pthread
.elif ${OSVERSION} < 502102
PTHREAD_CFLAGS?=        -D_THREAD_SAFE
PTHREAD_LIBS?=          -lc_r
.else
PTHREAD_CFLAGS?=
PTHREAD_LIBS?=          -lpthread
.endif

please try following patch:

@@ -301,6 +306,21 @@
        "FreeBSD")
                test_x=yes
                test_gtk=yes
+               AC_MSG_CHECKING([the FreeBSD operating system release])
+               if test -n "$with_os_version"; then
+                       OSVERSION="$with_os_version"
+               else
+                       OSVERSION=`/sbin/sysctl -n kern.osreldate`
+               fi
+               AC_MSG_RESULT([found OSVERSION=$OSVERSION])
+               PTHREAD_CFLAGS="-D_THREAD_SAFE"
+               if test "$OSVERSION" -lt "500016"; then
+                       PTHREAD_LIBS="-pthread"
+               elif test "$OSVERSION" -lt "502102"; then
+                       PTHREAD_LIBS="-lc_r"
+               else
+                       PTHREAD_LIBS="-lpthread"
+               fi
                ;;
        "OSF1")
                test_x=dontknow

I've also raized IZ.
http://www.openoffice.org/issues/show_bug.cgi?id=25496

thanks,
--nakata maho