Date: Wed, 17 Apr 2019 16:20:06 +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: r499184 - in head/devel: llvm70 llvm80 Message-ID: <201904171620.x3HGK69A059826@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Wed Apr 17 16:20:06 2019 New Revision: 499184 URL: https://svnweb.freebsd.org/changeset/ports/499184 Log: Fix the installation of llvm-lit's "cat" utility. On llvm80, also disable discovery of libz3 to avoid an untracked dependency when math/z3 is installed during a manual build. PR: 237284 Reported by: arrowd Sponsored by: DARPA, AFRL Modified: head/devel/llvm70/Makefile head/devel/llvm70/pkg-plist head/devel/llvm80/Makefile head/devel/llvm80/pkg-plist Modified: head/devel/llvm70/Makefile ============================================================================== --- head/devel/llvm70/Makefile Wed Apr 17 15:04:02 2019 (r499183) +++ head/devel/llvm70/Makefile Wed Apr 17 16:20:06 2019 (r499184) @@ -2,7 +2,7 @@ PORTNAME= llvm DISTVERSION= 7.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel lang MASTER_SITES= http://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} PKGNAMESUFFIX= ${LLVM_SUFFIX} @@ -399,9 +399,12 @@ post-install-LIT-on: ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ ${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX} ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX} + ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats ${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/*.py \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX} + ${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/builtin_commands/*.py \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands ${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/formats/*.py \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \ Modified: head/devel/llvm70/pkg-plist ============================================================================== --- head/devel/llvm70/pkg-plist Wed Apr 17 15:04:02 2019 (r499183) +++ head/devel/llvm70/pkg-plist Wed Apr 17 16:20:06 2019 (r499184) @@ -2999,6 +2999,8 @@ llvm%%LLVM_SUFFIX%%/share/opt-viewer/style.css %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/TestRunner.py %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/TestingConfig.py %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/__init__.py +%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/builtin_commands/__init__.py +%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/builtin_commands/cat.py %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/discovery.py %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/formats/__init__.py %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/formats/base.py Modified: head/devel/llvm80/Makefile ============================================================================== --- head/devel/llvm80/Makefile Wed Apr 17 15:04:02 2019 (r499183) +++ head/devel/llvm80/Makefile Wed Apr 17 16:20:06 2019 (r499184) @@ -2,7 +2,7 @@ PORTNAME= llvm DISTVERSION= 8.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel lang MASTER_SITES= http://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} PKGNAMESUFFIX= ${LLVM_SUFFIX} @@ -77,7 +77,8 @@ BE_${BE}_PLIST_FILES= ${_BE_LIBS_${BE}:O:S/$/.a/:S|^|$ CLANG_DESC= Build clang CLANG_EXTRA_PATCHES= ${PATCHDIR}/clang CLANG_DISTFILES= cfe-${DISTVERSION}.src${EXTRACT_SUFX} -CLANG_CMAKE_ON= -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp +CLANG_CMAKE_ON= -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp \ + -DCLANG_ANALYZER_ENABLE_Z3_SOLVER=OFF CLANG_PORTDOCS= clang CLANG_USE= GNOME=libxml2 COMPILER_RT_DESC= Sanitizer libraries @@ -474,9 +475,12 @@ post-install-LIT-on: ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ ${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX} ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX} + ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats ${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/*.py \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX} + ${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/builtin_commands/*.py \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands ${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/formats/*.py \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \ Modified: head/devel/llvm80/pkg-plist ============================================================================== --- head/devel/llvm80/pkg-plist Wed Apr 17 15:04:02 2019 (r499183) +++ head/devel/llvm80/pkg-plist Wed Apr 17 16:20:06 2019 (r499184) @@ -3048,6 +3048,8 @@ llvm%%LLVM_SUFFIX%%/share/opt-viewer/style.css %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/TestRunner.py %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/TestingConfig.py %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/__init__.py +%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/builtin_commands/__init__.py +%%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/builtin_commands/cat.py %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/discovery.py %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/formats/__init__.py %%LIT%%%%PYTHON_SITELIBDIR%%/lit%%LLVM_SUFFIX%%/formats/base.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904171620.x3HGK69A059826>