From owner-freebsd-openoffice@FreeBSD.ORG  Sat Feb 14 18:53:12 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 3FFBA16A4CE
	for <openoffice@FreeBSD.org>; Sat, 14 Feb 2004 18:53:12 -0800 (PST)
Received: from magnesium.net (toxic.magnesium.net [207.154.84.15])
	by mx1.FreeBSD.org (Postfix) with SMTP id 2C5FD43D1D
	for <openoffice@FreeBSD.org>; Sat, 14 Feb 2004 18:53:12 -0800 (PST)
	(envelope-from adamw@magnesium.net)
Received: (qmail 16313 invoked by uid 1252); 15 Feb 2004 02:53:12 -0000
Date: 14 Feb 2004 21:53:12 -0500
Date: Sat, 14 Feb 2004 21:53:12 -0500
From: Adam Weinberger <adamw@FreeBSD.org>
To: Nakata Maho <chat95@mbox.kyoto-inet.or.jp>
Message-ID: <20040215025312.GA10073@toxic.magnesium.net>
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>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20040215.114216.846933633.chat95@mbox.kyoto-inet.or.jp>
X-Editor: Vim 6.2 http://www.vim.org
X-Mailer: Mutt 1.5 http://www.mutt.org
X-URL: http://www.vectors.cx
X-ASL: 6/m/behind you
User-Agent: Mutt/1.5.4i
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:53:12 -0000

>> (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