Date: Thu, 14 Mar 2013 19:19:51 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314179 - head/devel/llvm-devel Message-ID: <201303141919.r2EJJpcj085880@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Thu Mar 14 19:19:50 2013 New Revision: 314179 URL: http://svnweb.freebsd.org/changeset/ports/314179 Log: Install lit.1 such that it actually works after "make clean" is run. Retain a llvm-lit links for code that can build with either an installed LLVM or an LLVM source tree. Minor makefile cleanup. Modified: head/devel/llvm-devel/Makefile head/devel/llvm-devel/pkg-plist Modified: head/devel/llvm-devel/Makefile ============================================================================== --- head/devel/llvm-devel/Makefile Thu Mar 14 19:14:47 2013 (r314178) +++ head/devel/llvm-devel/Makefile Thu Mar 14 19:19:50 2013 (r314179) @@ -7,6 +7,7 @@ PORTNAME= llvm DISTVERSION= 3.3.r${SVN_REV} +PORTREVISION= 1 CATEGORIES= devel lang MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= brooks @@ -24,7 +25,7 @@ BUILD_DEPENDS+= bash:${PORTSDIR}/shells/ BUILD_DEPENDS+= f2c:${PORTSDIR}/lang/f2c .endif -CONFLICTS= llvm-[23]* llvm29-* llvm31-* +CONFLICTS= llvm-[23]* llvm31-[3]* GNU_CONFIGURE= yes USE_GCC= 4.2+ @@ -52,6 +53,7 @@ MAN1= bugpoint.1 lit.1 llc.1 lli.1 llvm llvm-bcanalyzer.1 llvm-config.1 llvm-cov.1 llvm-diff.1 \ llvm-dis.1 llvm-extract.1 llvm-link.1 llvm-nm.1 \ llvm-prof.1 llvm-ranlib.1 llvm-stress.1 opt.1 tblgen.1 +MLINKS= lit.1 llvm-lit.1 LLVM_RELEASE= ${PORTVERSION:C/\.r[0-9]*//} PLIST_SUB+= LLVM_RELEASE=${LLVM_RELEASE} @@ -140,7 +142,10 @@ post-build: post-install: ${MV} ${PREFIX}/lib/${LIBNAME} ${PREFIX}/lib/${LIBNAME}.0 ${LN} -s ${LIBNAME}.0 ${PREFIX}/lib/${LIBNAME} - ${INSTALL_SCRIPT} ${WRKSRC}/Release/bin/llvm-lit ${PREFIX}/bin/ + ${INSTALL_SCRIPT} ${WRKSRC}/utils/lit/lit.py ${PREFIX}/bin/lit + ${LN} -s 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/ ${MKDIR} ${DATADIR}/cmake ${INSTALL_DATA} ${WRKSRC}/cmake/modules/*.cmake ${DATADIR}/cmake/ @@ -148,8 +153,8 @@ post-install: ${DATADIR}/cmake/ .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR}/html - find ${WRKSRC}/docs/_build/html -type f | \ - xargs -I _DOC_ ${INSTALL_DATA} _DOC_ ${DOCSDIR}/html/ + ${FIND} ${WRKSRC}/docs/_build/html -type f | \ + ${XARGS} -I _DOC_ ${INSTALL_DATA} _DOC_ ${DOCSDIR}/html/ .endif .for man in ${MAN1} @${INSTALL_MAN} ${WRKSRC}/docs/_build/man/${man} \ @@ -167,6 +172,7 @@ regression-test: ${BUILD_COOKIE} PLIST_FILE_LIST= bin/FileCheck \ bin/bugpoint \ + bin/lit \ bin/llc \ bin/lli \ bin/llvm* \ @@ -180,19 +186,23 @@ PLIST_FILE_LIST= bin/FileCheck \ lib/libprofile_rt.so PLIST_DIR_LIST= include/llvm-c \ include/llvm \ + ${PYTHON_SITELIBDIR:S;${PYTHONBASE}/;;}/lit \ ${DATADIR_REL} build-plist: ${RM} -f ${PLIST} cd ${PREFIX} && \ - (ls ${PLIST_FILE_LIST}; ${FIND} ${PLIST_DIR_LIST} -type f) | \ + (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|${DATADIR_REL}|%%DATADIR%%|' \ + -e 's|${PYTHON_SITELIBDIR:S;${PYTHONBASE}/;;}|%%PYTHON_SITELIBDIR%%|' | \ ${SORT} >> ${PLIST} ${FIND} ${DOCSDIR} -type f | \ ${SED} -e 's|${DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | \ ${SORT} >> ${PLIST} cd ${PREFIX} && \ ${FIND} ${PLIST_DIR_LIST} -type d | \ + ${SED} -e 's|${PYTHON_SITELIBDIR:S;${PYTHONBASE}/;;}|%%PYTHON_SITELIBDIR%%|' | \ ${SORT} -r | ${SED} -e 's|^|@dirrm |' >> ${PLIST} ${FIND} ${DOCSDIR} -type d | ${SORT} -r | \ ${SED} -e 's|${DOCSDIR}|%%DOCSDIR%%|' \ Modified: head/devel/llvm-devel/pkg-plist ============================================================================== --- head/devel/llvm-devel/pkg-plist Thu Mar 14 19:14:47 2013 (r314178) +++ head/devel/llvm-devel/pkg-plist Thu Mar 14 19:19:50 2013 (r314179) @@ -11,8 +11,22 @@ %%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 +%%PYTHON_SITELIBDIR%%/lit/ShCommands.py +%%PYTHON_SITELIBDIR%%/lit/ShUtil.py +%%PYTHON_SITELIBDIR%%/lit/Test.py +%%PYTHON_SITELIBDIR%%/lit/TestFormats.py +%%PYTHON_SITELIBDIR%%/lit/TestRunner.py +%%PYTHON_SITELIBDIR%%/lit/TestingConfig.py +%%PYTHON_SITELIBDIR%%/lit/Util.py +%%PYTHON_SITELIBDIR%%/lit/__init__.py +%%PYTHON_SITELIBDIR%%/lit/discovery.py +%%PYTHON_SITELIBDIR%%/lit/main.py bin/FileCheck bin/bugpoint +bin/lit bin/llc bin/lli bin/llvm-ar @@ -923,5 +937,6 @@ lib/libprofile_rt.so @dirrm include/llvm-c/Transforms @dirrm include/llvm-c @dirrm include/llvm +@dirrm %%PYTHON_SITELIBDIR%%/lit %%PORTDOCS%%@dirrm %%DOCSDIR%%/html %%PORTDOCS%%@dirrm %%DOCSDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303141919.r2EJJpcj085880>