Date: Sat, 3 Nov 2012 17:25:42 +0100 (CET) From: Gerald Pfeifer <gerald@pfeifer.com> To: office@FreeBSD.org, Maho NAKATA <chat95@mac.com> Subject: Re: Eliminating use of _GCC_BUILD_DEPENDS from openoffice-3-devel Message-ID: <alpine.LNX.2.00.1211031717260.2266@tuna.site> In-Reply-To: <alpine.LNX.2.00.1210132323540.2739@tuna.site> References: <alpine.LNX.2.00.1210132323540.2739@tuna.site>
next in thread | previous in thread | raw e-mail | index | archive | help
I now applied this based on maintainer timeout (3 weeks).
Is there any chance we can work on this together and identify why
you felt it was necessary in the first place? For, it should not,
and rather just work with the standards ports infrastructure.
Together I believe we'll be able to eradicate this hack altogether.
Gerald
On Sat, 13 Oct 2012, Gerald Pfeifer wrote:
> _GCC_BUILD_DEPENDS never was meant to be used outside of Mk/bsd.gcc.mk,
> and the settings of CFLAGS et al really should be sufficient.
>
> Apparently it was felt that was not the case, or something is not
> working as it should, I don't think I was asked about before this
> was put in.
>
> In any case, can we go for this patch which eliminates _GCC_BUILD_DEPENDS
> in favor of a new _GCC_RUNTIME? That is a stop gap, but at least
> an official one and easier than manually constructing the library
> path.
>
> Okay to apply the patch below to openoffice-3-devel and, a bit
> later, openoffice-3?
>
> Thanks,
> Gerald
>
> Index: Makefile
> ===================================================================
> --- Makefile (revision 305792)
> +++ Makefile (working copy)
> @@ -1,9 +1,5 @@
> -# New ports collection makefile for: Apache OpenOffice
> -# Date created: 28 February 2002
> -# Whom: Martin Blapp
> -#
> +# Created by: Martin Blapp
> # $FreeBSD$
> -#
>
> PORTNAME= apache-openoffice
> PORTVERSION= 3.4.${SVNREVISION}
> @@ -252,8 +248,8 @@
>
> post-patch:
> .if defined (USE_GCC)
> - @${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}+" ${WRKSRC}/solenv/inc/unxfbsd.mk
> - @${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}+" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
> + @${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/inc/unxfbsd.mk
> + @${REINPLACE_CMD} -e "s+%%RPATH%%+-Wl,-rpath=${_GCC_RUNTIME}+" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
> .else
> @${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/inc/unxfbsd.mk
> @${REINPLACE_CMD} -e "s+%%RPATH%%++" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk
>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.LNX.2.00.1211031717260.2266>