Date: Sun, 15 Feb 2004 11:42:16 +0900 (JST) From: Nakata Maho <chat95@mbox.kyoto-inet.or.jp> To: adamw@FreeBSD.org Cc: openoffice@FreeBSD.org Subject: Re: patch-config_office (NOTE for submitting patches) Message-ID: <20040215.114216.846933633.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>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040215.114216.846933633.chat95>