Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 26 May 2015 16:29:25 +0000 (UTC)
From:      Tilman Keskinoz <arved@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r387489 - in head/textproc/luceneplusplus: . files
Message-ID:  <201505261629.t4QGTPH8040434@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: arved
Date: Tue May 26 16:29:24 2015
New Revision: 387489
URL: https://svnweb.freebsd.org/changeset/ports/387489

Log:
  Attempt to work around pch related buildfailures on package cluster.
  
  Disable precompiled headers if compiler is gcc

Added:
  head/textproc/luceneplusplus/files/extra-patch-CMakeLists.txt   (contents, props changed)
Modified:
  head/textproc/luceneplusplus/Makefile

Modified: head/textproc/luceneplusplus/Makefile
==============================================================================
--- head/textproc/luceneplusplus/Makefile	Tue May 26 16:00:41 2015	(r387488)
+++ head/textproc/luceneplusplus/Makefile	Tue May 26 16:29:24 2015	(r387489)
@@ -16,11 +16,15 @@ LIB_DEPENDS=	libboost_system.so:${PORTSD
 USE_GITHUB=	yes
 GH_ACCOUNT=	luceneplusplus
 GH_PROJECT=	LucenePlusPlus
-USES=		cmake:outsource
+USES=		cmake:outsource compiler
 USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
+.if ${COMPILER_TYPE} == gcc
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-CMakeLists.txt
+.endif
+
 post-install:
 	cd ${WRKSRC}/include &&${INSTALL_DATA} *.h \
 		${STAGEDIR}${PREFIX}/include/lucene++/

Added: head/textproc/luceneplusplus/files/extra-patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/luceneplusplus/files/extra-patch-CMakeLists.txt	Tue May 26 16:29:24 2015	(r387489)
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2015-01-30 17:14:22.000000000 +0100
++++ CMakeLists.txt	2015-05-26 18:05:53.000000000 +0200
+@@ -20,6 +20,8 @@
+ ####################################
+ include(cotire)
+ 
++set_property(GLOBAL PROPERTY COTIRE_ENABLE_PRECOMPILED_HEADER FALSE)
++
+ # if setup using the Toolchain-llvm.cmake file, then use llvm...
+ if(ENABLE_LLVM)
+   include(Toolchain-llvm)



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