Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 11 Jan 2014 15:05:27 +0100
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        Dirk Meyer <dinoex@FreeBSD.org>
Cc:        svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org
Subject:   Re: svn commit: r339400 - in head/net-im: licq licq-qt-gui
Message-ID:  <20140111150527.4297f016@kalimero.tijl.coosemans.org>
In-Reply-To: <201401110633.s0B6X7Nj009042@svn.freebsd.org>
References:  <201401110633.s0B6X7Nj009042@svn.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, 11 Jan 2014 06:33:07 +0000 (UTC) Dirk Meyer wrote:
> Author: dinoex
> Date: Sat Jan 11 06:33:06 2014
> New Revision: 339400
> URL: http://svnweb.freebsd.org/changeset/ports/339400
> 
> Log:
>   - add USE_GCC for CURRENT
> 
> Modified:
>   head/net-im/licq-qt-gui/Makefile
>   head/net-im/licq/Makefile
> 
> Modified: head/net-im/licq-qt-gui/Makefile
> ==============================================================================
> --- head/net-im/licq-qt-gui/Makefile	Sat Jan 11 04:29:06 2014	(r339399)
> +++ head/net-im/licq-qt-gui/Makefile	Sat Jan 11 06:33:06 2014	(r339400)
> @@ -14,6 +14,7 @@ LICENSE=	GPLv2
>  LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs
>  RUN_DEPENDS=	${LOCALBASE}/lib/licq/protocol_icq.so:${PORTSDIR}/${LICQ_PORT}-icq
>  
> +USE_GCC=	yes
>  USE_XORG=	x11 xext ice xscrnsaver
>  USES=		cmake
>  USE_QT4=	qmake_build moc_build rcc_build uic_build linguist_build
> 
> Modified: head/net-im/licq/Makefile
> ==============================================================================
> --- head/net-im/licq/Makefile	Sat Jan 11 04:29:06 2014	(r339399)
> +++ head/net-im/licq/Makefile	Sat Jan 11 06:33:06 2014	(r339400)
> @@ -14,6 +14,7 @@ LIB_DEPENDS=	libboost_regex.so:${PORTSDI
>  
>  LICENSE=	GPLv2
>  
> +USE_GCC=	yes
>  USES=		cmake iconv
>  WRKSRC=		${WRKDIR}/${DISTNAME}
>  LICQ_PORT?=	net-im/licq

Have you run-tested this, because this port has C++ code and then
USE_GCC almost certainly doesn't work on FreeBSD 10+.

It seems the use of std::tr1 is entirely contained within the Google
Test framework and you can fix that by defining GTEST_USE_OWN_TR1_TUPLE
like this:

Index: Makefile
===================================================================
--- Makefile	(revision 339424)
+++ Makefile	(working copy)
@@ -14,7 +14,6 @@ LIB_DEPENDS=	libboost_regex.so:${PORTSDI
 
 LICENSE=	GPLv2
 
-USE_GCC=	yes
 USES=		cmake iconv
 WRKSRC=		${WRKDIR}/${DISTNAME}
 LICQ_PORT?=	net-im/licq
@@ -23,7 +22,7 @@ LICQ_PORT?=	net-im/licq
 LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib ${ICONV_LIB} -Wl,--export-dynamic
 CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	-I${LOCALBASE}/include
-CXXFLAGS+=	-Wl,--export-dynamic
+CXXFLAGS+=	-Wl,--export-dynamic -DGTEST_USE_OWN_TR1_TUPLE
 
 OPTIONS_DEFINE=	OPENSSL
 OPTIONS_DEFAULT=OPENSSL



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140111150527.4297f016>