From owner-svn-ports-all@freebsd.org Wed Apr 17 16:20:08 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 496C4157118D; Wed, 17 Apr 2019 16:20:08 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E144586A6A; Wed, 17 Apr 2019 16:20:07 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B959698EC; Wed, 17 Apr 2019 16:20:07 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3HGK7ew059829; Wed, 17 Apr 2019 16:20:07 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3HGK69A059826; Wed, 17 Apr 2019 16:20:06 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201904171620.x3HGK69A059826@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Wed, 17 Apr 2019 16:20:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r499184 - in head/devel: llvm70 llvm80 X-SVN-Group: ports-head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: in head/devel: llvm70 llvm80 X-SVN-Commit-Revision: 499184 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E144586A6A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.977,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Wed, 17 Apr 2019 16:20:08 -0000 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