Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 14 May 2015 19:03:05 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r386354 - branches/2015Q2/textproc/sigil
Message-ID:  <201505141903.t4EJ35hD093163@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu May 14 19:03:04 2015
New Revision: 386354
URL: https://svnweb.freebsd.org/changeset/ports/386354

Log:
  MFH: r385615
  
  textproc/sigil: unbreak build on the package cluster (PCH)
  
  PR:		199905
  Approved by:	/head @ r385020
  Approved by:	ports-secteam (delphij)

Modified:
  branches/2015Q2/textproc/sigil/Makefile
Directory Properties:
  branches/2015Q2/   (props changed)

Modified: branches/2015Q2/textproc/sigil/Makefile
==============================================================================
--- branches/2015Q2/textproc/sigil/Makefile	Thu May 14 18:45:16 2015	(r386353)
+++ branches/2015Q2/textproc/sigil/Makefile	Thu May 14 19:03:04 2015	(r386354)
@@ -18,11 +18,18 @@ LIB_DEPENDS=	libboost_thread.so:${PORTSD
 		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
 		libpcre.so:${PORTSDIR}/devel/pcre
 
-USES=		cmake desktop-file-utils pkgconfig zip
+USES=		cmake compiler desktop-file-utils pkgconfig zip
 NO_WRKSUBDIR=	yes
 USE_QT4=	qmake gui svg webkit xml moc uic rcc imageformats linguist
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/CMakeLists.txt
+.if ${COMPILER_TYPE} == gcc
+# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html
+	@${REINPLACE_CMD} -e '/precompiled_header/d' \
+		${WRKSRC}/src/FlightCrew/CMakeLists.txt
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>



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