Date: Sat, 14 Feb 2004 21:53:12 -0500 From: Adam Weinberger <adamw@FreeBSD.org> To: Nakata Maho <chat95@mbox.kyoto-inet.or.jp> Cc: openoffice@FreeBSD.org Subject: Re: patch-config_office (NOTE for submitting patches) Message-ID: <20040215025312.GA10073@toxic.magnesium.net> In-Reply-To: <20040215.114216.846933633.chat95@mbox.kyoto-inet.or.jp> References: <20040214152312.GR3365@toxic.magnesium.net> <200402141608.i1EG8tiA078987@sakura.ninth-nine.com> <20040214161442.GT3365@toxic.magnesium.net> <20040215.114216.846933633.chat95@mbox.kyoto-inet.or.jp>
next in thread | previous in thread | raw e-mail | index | archive | help
>> (02.14.2004 @ 2142 PST): Nakata Maho said, in 1.9K: <<
> 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
>
>> end of "Re: patch-config_office (NOTE for submitting patches)" from Nakata Maho <<
Well, seeing as how $PTHREAD_LIBS and $PTHREAD_CFLAGS are defined in
bsd.port.mk, why not just pass those values in ${CONFIGURE_ENV}? Or put
in a marker in patch-config_office and ${REINPLACE_CMD} it to the proper
values...
# Adam
--
Adam Weinberger
adam@vectors.cx // adamw@FreeBSD.org // adamw@magnesium.net
http://www.vectors.cx
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040215025312.GA10073>