From owner-svn-ports-all@FreeBSD.ORG Thu Jul 11 21:53:14 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 31A55426; Thu, 11 Jul 2013 21:53:14 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 09A8717F9; Thu, 11 Jul 2013 21:53:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6BLrDti035026; Thu, 11 Jul 2013 21:53:13 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6BLrDFU035025; Thu, 11 Jul 2013 21:53:13 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201307112153.r6BLrDFU035025@svn.freebsd.org> From: Brooks Davis Date: Thu, 11 Jul 2013 21:53:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322799 - head/devel/llvm33 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jul 2013 21:53:14 -0000 Author: brooks Date: Thu Jul 11 21:53:13 2013 New Revision: 322799 URL: http://svnweb.freebsd.org/changeset/ports/322799 Log: Add an option to create and install files to let cmake build projects that depend on llvm work. Enable this by default so they are in packages. Modified: head/devel/llvm33/Makefile Modified: head/devel/llvm33/Makefile ============================================================================== --- head/devel/llvm33/Makefile Thu Jul 11 21:28:39 2013 (r322798) +++ head/devel/llvm33/Makefile Thu Jul 11 21:53:13 2013 (r322799) @@ -2,7 +2,7 @@ PORTNAME= llvm PORTVERSION= 3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel lang MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src @@ -15,6 +15,7 @@ LIB_DEPENDS= execinfo:${PORTSDIR}/devel/ LLVM_SUFFIX= ${PORTVERSION:S/.//g} LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} +DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} LATEST_LINK= ${PORTNAME}${LLVM_SUFFIX} GNU_CONFIGURE= yes @@ -36,12 +37,13 @@ LIBNAME= libLLVM-${DISTVERSION:C/\rc[0- CONFIGURE_ARGS+= --enable-bindings=none CONFIGURE_ARGS+= --enable-optimized -OPTIONS_DEFINE= ASSERTS DOCS LTOPLUGIN MANPAGES +OPTIONS_DEFINE= ASSERTS CMAKE DOCS LTOPLUGIN MANPAGES ASSERTS_DESC= Enable assertions (thread unsafe) +CMAKE_DESC= Build cmake support files LTOPLUGIN_DESC= Build LTO plugin (requires gold) -OPTIONS_DEFAULT= MANPAGES +OPTIONS_DEFAULT= CMAKE MANPAGES PLIST_SUB+= PORTVERSION=${PORTVERSION} @@ -82,6 +84,11 @@ CONFIGURE_ARGS+= --enable-assertions CONFIGURE_ARGS+= --disable-assertions .endif +.if ${PORT_OPTIONS:MCMAKE} +BUILD_DEPENDS+= cmake:${PORTSDIR}/devel/cmake +PORTDATA+= cmake +.endif + .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES} BUILD_DEPENDS+= sphinx-build:${PORTSDIR}/textproc/py-sphinx .endif @@ -131,6 +138,15 @@ post-patch: ${REINPLACE_CMD} -e 's|\(PROJ_mandir.*:=\).*$$|\1${MANPREFIX}/man|g' \ ${WRKSRC}/Makefile.config.in +.if ${PORT_OPTIONS:MCMAKE} +post-configure: + ${MKDIR} ${WRKDIR}/cmake + cd ${WRKDIR}/cmake && cmake -G "Unix Makefiles" ${WRKSRC} + ${REINPLACE_CMD} -e 's|${WRKDIR}/cmake|${LLVM_PREFIX}|' \ + -e 's|${WRKSRC}/cmake/modules|${DATADIR}/cmake|' \ + ${WRKDIR}/cmake/share/llvm/cmake/LLVMConfig.cmake +.endif + post-build: .if ${PORT_OPTIONS:MMANPAGES} @cd ${WRKSRC}/docs && ${GMAKE} -f Makefile.sphinx man @@ -148,6 +164,12 @@ post-install: ${LN} -f ${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \ ${PREFIX}/bin/${command}${LLVM_SUFFIX} .endfor +.if ${PORT_OPTIONS:MCMAKE} + ${MKDIR} ${DATADIR}/cmake + ${INSTALL_DATA} ${WRKSRC}/cmake/modules/*.cmake ${DATADIR}/cmake/ + ${INSTALL_DATA} ${WRKDIR}/cmake/share/llvm/cmake/*.cmake \ + ${DATADIR}/cmake/ +.endif .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR}/html ${FIND} ${WRKSRC}/docs/_build/html -type f | \