From owner-svn-ports-all@FreeBSD.ORG Sat Aug 24 14:05:18 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id F35D1812; Sat, 24 Aug 2013 14:05:17 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D1E922FD2; Sat, 24 Aug 2013 14:05:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7OE5HN7035825; Sat, 24 Aug 2013 14:05:17 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7OE5HwX035822; Sat, 24 Aug 2013 14:05:17 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201308241405.r7OE5HwX035822@svn.freebsd.org> From: Brooks Davis Date: Sat, 24 Aug 2013 14:05:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325297 - head/devel/llvm-devel 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: Sat, 24 Aug 2013 14:05:18 -0000 Author: brooks Date: Sat Aug 24 14:05:17 2013 New Revision: 325297 URL: http://svnweb.freebsd.org/changeset/ports/325297 Log: Reduce diffs to devel/llvm33 by removing a few obsolete bits and making the building of cmake support files optional. Modified: head/devel/llvm-devel/Makefile head/devel/llvm-devel/pkg-plist Modified: head/devel/llvm-devel/Makefile ============================================================================== --- head/devel/llvm-devel/Makefile Sat Aug 24 12:50:39 2013 (r325296) +++ head/devel/llvm-devel/Makefile Sat Aug 24 14:05:17 2013 (r325297) @@ -7,7 +7,7 @@ PORTNAME= llvm DISTVERSION= 3.4.r${SVN_REV} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel lang MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= brooks @@ -16,11 +16,6 @@ PKGNAMESUFFIX= -devel MAINTAINER= brooks@FreeBSD.org COMMENT= Low Level Virtual Machine -BUILD_DEPENDS+= cmake:${PORTSDIR}/devel/cmake -.if defined(PACKAGE_BUILDING) -BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash -.endif - CONFLICTS= llvm-2* llvm-3.[012]* llvm31-[3]* GNU_CONFIGURE= yes @@ -37,14 +32,14 @@ LIBNAME= libLLVM-${DISTVERSION:C/\.r[0- CONFIGURE_ARGS+= --enable-bindings=none CONFIGURE_ARGS+= --enable-optimized -CONFIGURE_ARGS+= --program-suffix=${DISTVERSION:C/\.r[0-9]*//}svn -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 LLVM_RELEASE= ${PORTVERSION:C/\.r[0-9]*//} PLIST_SUB+= LLVM_RELEASE=${LLVM_RELEASE} @@ -57,6 +52,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 @@ -126,12 +126,14 @@ 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|${PREFIX}|' \ -e 's|${WRKSRC}|${DATADIR}|' \ ${WRKDIR}/cmake/share/llvm/cmake/LLVMConfig.cmake +.endif post-build: .if ${PORT_OPTIONS:MMANPAGES} @@ -143,16 +145,18 @@ post-build: post-install: ${MV} ${PREFIX}/lib/${LIBNAME} ${PREFIX}/lib/${LIBNAME}.0 - ${LN} -s ${LIBNAME}.0 ${PREFIX}/lib/${LIBNAME} + ${LN} -sf ${LIBNAME}.0 ${PREFIX}/lib/${LIBNAME} ${INSTALL_SCRIPT} ${WRKSRC}/utils/lit/lit.py ${PREFIX}/bin/lit - ${LN} -s lit ${PREFIX}/bin/llvm-lit + ${LN} -sf lit ${PREFIX}/bin/llvm-lit ${MKDIR} ${PYTHON_SITELIBDIR}/lit ${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/*.py ${PYTHON_SITELIBDIR}/lit ${INSTALL_PROGRAM} ${WRKSRC}/Release/bin/FileCheck ${PREFIX}/bin/ +.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 | \ @@ -188,15 +192,13 @@ PLIST_FILE_LIST= bin/FileCheck \ lib/libprofile_rt.so PLIST_DIR_LIST= include/llvm-c \ include/llvm \ - ${PYTHON_SITELIBDIR:S;${PYTHONBASE}/;;}/lit \ - ${DATADIR_REL} + ${PYTHON_SITELIBDIR:S;${PYTHONBASE}/;;}/lit build-plist: ${RM} -f ${PLIST} cd ${PREFIX} && \ (ls ${PLIST_FILE_LIST}; \ ${FIND} ${PLIST_DIR_LIST} -type f -o -type l) | \ ${SED} -e 's|${LLVM_RELEASE}|%%LLVM_RELEASE%%|' \ - -e 's|${DATADIR_REL}|%%DATADIR%%|' \ -e 's|${PYTHON_SITELIBDIR:S;${PYTHONBASE}/;;}|%%PYTHON_SITELIBDIR%%|' | \ ${SORT} >> ${PLIST} ${FIND} ${DOCSDIR} -type f | \ Modified: head/devel/llvm-devel/pkg-plist ============================================================================== --- head/devel/llvm-devel/pkg-plist Sat Aug 24 12:50:39 2013 (r325296) +++ head/devel/llvm-devel/pkg-plist Sat Aug 24 14:05:17 2013 (r325297) @@ -1,17 +1,3 @@ -%%DATADIR%%/cmake/AddLLVM.cmake -%%DATADIR%%/cmake/AddLLVMDefinitions.cmake -%%DATADIR%%/cmake/CheckAtomic.cmake -%%DATADIR%%/cmake/ChooseMSVCCRT.cmake -%%DATADIR%%/cmake/GetHostTriple.cmake -%%DATADIR%%/cmake/GetSVN.cmake -%%DATADIR%%/cmake/HandleLLVMOptions.cmake -%%DATADIR%%/cmake/LLVM-Config.cmake -%%DATADIR%%/cmake/LLVMConfig.cmake -%%DATADIR%%/cmake/LLVMConfigVersion.cmake -%%DATADIR%%/cmake/LLVMParseArguments.cmake -%%DATADIR%%/cmake/LLVMProcessSources.cmake -%%DATADIR%%/cmake/TableGen.cmake -%%DATADIR%%/cmake/VersionFromVCS.cmake %%PYTHON_SITELIBDIR%%/lit/LitConfig.py %%PYTHON_SITELIBDIR%%/lit/LitTestCase.py %%PYTHON_SITELIBDIR%%/lit/ProgressBar.py @@ -950,8 +936,6 @@ lib/libprofile_rt.so %%PORTDOCS%%%%DOCSDIR%%/html/websupport.js %%PORTDOCS%%%%DOCSDIR%%/html/yaml2obj.html %%PORTDOCS%%%%DOCSDIR%%/html/yaml2obj.txt -@dirrm share/llvm/cmake -@dirrm share/llvm @dirrm include/llvm/Transforms/Utils @dirrm include/llvm/Transforms/IPO @dirrm include/llvm/Transforms