svn commit: r414441 - in head/textproc/luceneplusplus: . files

[Tilman Keskinoz]

Author: arved
Date: Mon May  2 12:40:09 2016
New Revision: 414441
URL: https://svnweb.freebsd.org/changeset/ports/414441

Log:
  Cotire compilation speedup fails with upcoming libc++ 3.8.0, so disable it.
  
  Reported by:	dim@

Deleted:
  head/textproc/luceneplusplus/files/extra-patch-CMakeLists.txt
Modified:
  head/textproc/luceneplusplus/Makefile
  head/textproc/luceneplusplus/files/patch-CMakeLists.txt

Modified: head/textproc/luceneplusplus/Makefile
==============================================================================
--- head/textproc/luceneplusplus/Makefile	Mon May  2 12:00:08 2016	(r414440)
+++ head/textproc/luceneplusplus/Makefile	Mon May  2 12:40:09 2016	(r414441)
@@ -23,9 +23,10 @@ USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${COMPILER_TYPE} == gcc
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-CMakeLists.txt
-.endif
+post-patch:
+	${REINPLACE_CMD} "/cotire/d" ${WRKSRC}/src/contrib/CMakeLists.txt \
+		${WRKSRC}/src/core/CMakeLists.txt \
+		${WRKSRC}/src/test/CMakeLists.txt
 
 post-install:
 	cd ${WRKSRC}/include &&${INSTALL_DATA} *.h \

Modified: head/textproc/luceneplusplus/files/patch-CMakeLists.txt
==============================================================================
--- head/textproc/luceneplusplus/files/patch-CMakeLists.txt	Mon May  2 12:00:08 2016	(r414440)
+++ head/textproc/luceneplusplus/files/patch-CMakeLists.txt	Mon May  2 12:40:09 2016	(r414441)
@@ -1,6 +1,14 @@
---- CMakeLists.txt.orig	2015-02-25 13:04:40.000000000 +0100
-+++ CMakeLists.txt	2015-02-25 13:05:18.000000000 +0100
-@@ -168,7 +168,7 @@
+--- CMakeLists.txt.orig	2015-01-30 17:14:22.000000000 +0100
++++ CMakeLists.txt	2016-04-29 17:50:01.000000000 +0200
+@@ -18,7 +18,6 @@
+ ####################################
+ # pre-compiled headers support
+ ####################################
+-include(cotire)
+ 
+ # if setup using the Toolchain-llvm.cmake file, then use llvm...
+ if(ENABLE_LLVM)
+@@ -168,7 +167,7 @@
      FILES
      "${CMAKE_CURRENT_BINARY_DIR}/liblucene++.pc"
      "${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contrib.pc"