From owner-svn-ports-head@freebsd.org Mon Nov 23 17:28:57 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A3D1FA329A3; Mon, 23 Nov 2015 17:28:57 +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 mx1.freebsd.org (Postfix) with ESMTPS id 68F321F4F; Mon, 23 Nov 2015 17:28:57 +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 tANHSunD049163; Mon, 23 Nov 2015 17:28:56 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tANHStoC049157; Mon, 23 Nov 2015 17:28:55 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201511231728.tANHStoC049157@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Mon, 23 Nov 2015 17:28:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r402286 - in head/devel: compiler-rt-devel llvm-devel llvm-devel/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Nov 2015 17:28:57 -0000 Author: brooks Date: Mon Nov 23 17:28:55 2015 New Revision: 402286 URL: https://svnweb.freebsd.org/changeset/ports/402286 Log: Update llvm-devel and compiler-rt-devel to a new snapshot. Add a script to update the snapshot SHAs. Disable clang-tools-extras when building with gcc on FreeBSD due to the incomplete C++11 support. Fix a plist bug when lldb wasn't installed. Added: head/devel/llvm-devel/files/gen-Makefile.snapshot.sh (contents, props changed) Modified: head/devel/compiler-rt-devel/distinfo head/devel/llvm-devel/Makefile head/devel/llvm-devel/Makefile.snapshot head/devel/llvm-devel/distinfo head/devel/llvm-devel/pkg-plist Modified: head/devel/compiler-rt-devel/distinfo ============================================================================== --- head/devel/compiler-rt-devel/distinfo Mon Nov 23 17:00:18 2015 (r402285) +++ head/devel/compiler-rt-devel/distinfo Mon Nov 23 17:28:55 2015 (r402286) @@ -1,2 +1,2 @@ -SHA256 (llvm-mirror-compiler-rt-3.8.d20151021-d6184a3b9865249280fdf03830f4b907855ea842_GH0.tar.gz) = 15146786c2df34c608b797d6bce51319efae50f27a9481cadc848898f3aff64a -SIZE (llvm-mirror-compiler-rt-3.8.d20151021-d6184a3b9865249280fdf03830f4b907855ea842_GH0.tar.gz) = 2165729 +SHA256 (llvm-mirror-compiler-rt-3.8.d20151120-1e8208e85963252f79cc1663c46dfe38d5ef6e82_GH0.tar.gz) = e63aa9b0842c8396f1ea7b78cd876f76186b2c5f958a8823febec5a29b80fdc3 +SIZE (llvm-mirror-compiler-rt-3.8.d20151120-1e8208e85963252f79cc1663c46dfe38d5ef6e82_GH0.tar.gz) = 2189924 Modified: head/devel/llvm-devel/Makefile ============================================================================== --- head/devel/llvm-devel/Makefile Mon Nov 23 17:00:18 2015 (r402285) +++ head/devel/llvm-devel/Makefile Mon Nov 23 17:28:55 2015 (r402286) @@ -3,7 +3,6 @@ PORTNAME= llvm PORTVERSION= ${LLVM_MAJOR}.d${SNAPDATE} -PORTREVISION= 1 CATEGORIES= devel lang PKGNAMESUFFIX= -devel @@ -103,7 +102,8 @@ COMMANDS= bugpoint \ llvm-symbolizer \ llvm-tblgen \ macho-dump \ - opt + opt \ + sancov FIRST_COMMAND= ${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//} STRIP_LIBS= BugpointPasses.so \ @@ -116,7 +116,8 @@ EXTRAS_COMMANDS= \ clang-modernize \ clang-query \ clang-rename \ - clang-tidy + clang-tidy \ + modularize EXTRAS_LIBS= \ libclangApplyReplacements \ libclangQuery \ @@ -133,7 +134,8 @@ EXTRAS_PATTERN= ${EXTRAS_COMMANDS:tW:C/ .include .if ${PORT_OPTIONS:MCLANG} -COMMANDS+= clang \ +COMMANDS+= c-index-test \ + clang \ clang++ \ clang-check \ clang-cpp \ @@ -142,7 +144,7 @@ COMMANDS+= clang \ scan-view MAN1SRCS+= clang.1 \ scan-build.1 -CLANG_PATTERN= (clang|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|six.py|-analyzer) +CLANG_PATTERN= (c-index-test|clang|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer) .endif .if ${PORT_OPTIONS:MEXTRAS} @@ -191,6 +193,7 @@ NOT_FOR_ARCH= ia64 .if ${OPSYS} == "FreeBSD" && ${COMPILER_TYPE} != clang # Evil hack around gcc48 not providing a usable c++11 environment on 9.x +PLIST_SUB:= ${PLIST_SUB:NEXTRAS=*} EXTRAS="@comment " PLIST_SUB:= ${PLIST_SUB:NLLDB=*} LLDB="@comment " .endif @@ -202,7 +205,9 @@ post-extract-CLANG-on: ${MV} ${WRKSRC_clang} ${PATCH_WRKSRC}/tools/clang post-extract-EXTRAS-on: +.if ${OPSYS} != "FreeBSD" || ${COMPILER_TYPE} == clang ${MV} ${WRKSRC_extras} ${PATCH_WRKSRC}/tools/clang/tools/extra +.endif post-extract-LLD-on: ${MV} ${WRKSRC_lld} ${PATCH_WRKSRC}/tools/lld @@ -242,11 +247,6 @@ post-install-DOCS-on: ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/ ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/ -post-install-LLDB-on: -.if ${OPSYS} != "FreeBSD" || ${COMPILER_TYPE} == clang - ${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib -.endif - post-install-CLANG-on: ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \ ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp @@ -299,7 +299,7 @@ build-plist: if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /omp.h|${EXTRAS_PATTERN}/) {printf "%%%%CLANG%%%%"} \ if ($$0 ~ /lld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \ if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \ - if ($$0 ~ /(argdumper|lldb)/) {printf "%%%%LLDB%%%%"} \ + if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \ if ($$0 ~ /lib.*omp/) {printf "%%%%OPENMP%%%%"} \ if ($$0 ~ /LLVMgold/) {printf "%%%%GOLD%%%%"} \ if ($$0 !~ /libclang_rt/) {print} \ Modified: head/devel/llvm-devel/Makefile.snapshot ============================================================================== --- head/devel/llvm-devel/Makefile.snapshot Mon Nov 23 17:00:18 2015 (r402285) +++ head/devel/llvm-devel/Makefile.snapshot Mon Nov 23 17:28:55 2015 (r402286) @@ -1,16 +1,17 @@ # $FreeBSD$ # -# Ideally this would be generate by a script using the github API, but -# for now it's hand crafted. +# Generated file! Do not edit! +# +# Generated by: files/gen-Makefile.snapshot.sh. # LLVM_MAJOR= 3.8 LLVM_RELEASE= ${LLVM_MAJOR}.0 -SNAPDATE= 20151111 +SNAPDATE= 20151120 -LLVM_COMMIT= e2eaa9712db78fe0a0ddbd10c5322c45c54af9a8 -CLANG_COMMIT= ab9291dcf3aebf97a9bc33929badccfb7508a96a -COMPILER_RT_COMMIT= ced37c5d651dc563854d8981825d8db425f656a0 -EXTRAS_COMMIT= be8298c4aade0dbd8002dde011a35c2bfea67da2 -LLD_COMMIT= e2ff74142980e07f0b68ffce73aa836ec10a970f -LLDB_COMMIT= c756af6515975a744d0b213b180350b35eadf427 -OPENMP_COMMIT= 0d94178f2d67cb35bc29bba37991b2ace3a3643a +LLVM_COMMIT= c9180bfb44d24e6c3251761548ebb2673741302e +CLANG_COMMIT= da953be48862a0239e71e60d68a528a3147aa523 +COMPILER_RT_COMMIT= 1e8208e85963252f79cc1663c46dfe38d5ef6e82 +EXTRAS_COMMIT= 19b9081679b19021d54338f0670437c62ad13e11 +LLD_COMMIT= 063b5f3bc91adf8be367db0ae0cb922e43198935 +LLDB_COMMIT= 2ec2da4ee52780582d5e9c88b2e982a688fbdbe1 +OPENMP_COMMIT= 271a72612d4577d905073509018cf6b467ebdb12 Modified: head/devel/llvm-devel/distinfo ============================================================================== --- head/devel/llvm-devel/distinfo Mon Nov 23 17:00:18 2015 (r402285) +++ head/devel/llvm-devel/distinfo Mon Nov 23 17:28:55 2015 (r402286) @@ -1,12 +1,12 @@ -SHA256 (llvm-mirror-llvm-3.8.d20151111-e2eaa9712db78fe0a0ddbd10c5322c45c54af9a8_GH0.tar.gz) = 0e77389b0a79c2dee9e5acab0f9a59ec488e9ff77bdc9c7f758beea80949ab94 -SIZE (llvm-mirror-llvm-3.8.d20151111-e2eaa9712db78fe0a0ddbd10c5322c45c54af9a8_GH0.tar.gz) = 22545456 -SHA256 (llvm-mirror-clang-ab9291dcf3aebf97a9bc33929badccfb7508a96a_GH0.tar.gz) = f11896aefd8d534dc6ba291272551fbeb293d7d7235ac60cdfaf523d23938f95 -SIZE (llvm-mirror-clang-ab9291dcf3aebf97a9bc33929badccfb7508a96a_GH0.tar.gz) = 12914895 -SHA256 (llvm-mirror-clang-tools-extra-be8298c4aade0dbd8002dde011a35c2bfea67da2_GH0.tar.gz) = c24bfd7ea215abb6595bf39f3b09c39dd4bb39475876888c8d4ef2498d7e9ef8 -SIZE (llvm-mirror-clang-tools-extra-be8298c4aade0dbd8002dde011a35c2bfea67da2_GH0.tar.gz) = 510431 -SHA256 (llvm-mirror-lld-e2ff74142980e07f0b68ffce73aa836ec10a970f_GH0.tar.gz) = 112716ddb90e6cb9e11792dc3b6adf7da5d9cb8b1f481f61eceaf4c08fe3e7d6 -SIZE (llvm-mirror-lld-e2ff74142980e07f0b68ffce73aa836ec10a970f_GH0.tar.gz) = 807805 -SHA256 (llvm-mirror-lldb-c756af6515975a744d0b213b180350b35eadf427_GH0.tar.gz) = 39495d6bd3de39edf736f322cfae030f3cbd8c419cb2d8de54844920edb5647f -SIZE (llvm-mirror-lldb-c756af6515975a744d0b213b180350b35eadf427_GH0.tar.gz) = 13501881 -SHA256 (llvm-mirror-openmp-0d94178f2d67cb35bc29bba37991b2ace3a3643a_GH0.tar.gz) = 3af0eca52f650be770092776f5e5e5bfe9a4ee058d157ba75d159dbf60bb68e4 -SIZE (llvm-mirror-openmp-0d94178f2d67cb35bc29bba37991b2ace3a3643a_GH0.tar.gz) = 2784271 +SHA256 (llvm-mirror-llvm-3.8.d20151120-c9180bfb44d24e6c3251761548ebb2673741302e_GH0.tar.gz) = be5ec79ba7754157f255b9e4b68c20f8267ed4b6f1c89535300c058ffef1bd58 +SIZE (llvm-mirror-llvm-3.8.d20151120-c9180bfb44d24e6c3251761548ebb2673741302e_GH0.tar.gz) = 23259485 +SHA256 (llvm-mirror-clang-da953be48862a0239e71e60d68a528a3147aa523_GH0.tar.gz) = ace1481a046d542f9cc2806d39d1410af44d5009778587e26d60ee0ff7b4c73c +SIZE (llvm-mirror-clang-da953be48862a0239e71e60d68a528a3147aa523_GH0.tar.gz) = 12941122 +SHA256 (llvm-mirror-clang-tools-extra-19b9081679b19021d54338f0670437c62ad13e11_GH0.tar.gz) = 1032f0c4b0e4df5fd22390f2a2d3a8cd8b9b2b7f251fbfb33fcb2691031d1dd7 +SIZE (llvm-mirror-clang-tools-extra-19b9081679b19021d54338f0670437c62ad13e11_GH0.tar.gz) = 511784 +SHA256 (llvm-mirror-lld-063b5f3bc91adf8be367db0ae0cb922e43198935_GH0.tar.gz) = 9740cc8358b61dcc1d4ad1aa5b72ebaceae80f02944aefd7dbe13e5b22a588ee +SIZE (llvm-mirror-lld-063b5f3bc91adf8be367db0ae0cb922e43198935_GH0.tar.gz) = 820136 +SHA256 (llvm-mirror-lldb-2ec2da4ee52780582d5e9c88b2e982a688fbdbe1_GH0.tar.gz) = 9107f0bb16eea8b42eda9b0ba7e57bd81114f7f4f32c8e9571114f8f5216fcd4 +SIZE (llvm-mirror-lldb-2ec2da4ee52780582d5e9c88b2e982a688fbdbe1_GH0.tar.gz) = 13504011 +SHA256 (llvm-mirror-openmp-271a72612d4577d905073509018cf6b467ebdb12_GH0.tar.gz) = 9d04e9f0e384b3f3351fea93fad86fbaaca206e6341ad431cfaa25a884b58001 +SIZE (llvm-mirror-openmp-271a72612d4577d905073509018cf6b467ebdb12_GH0.tar.gz) = 2784222 Added: head/devel/llvm-devel/files/gen-Makefile.snapshot.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm-devel/files/gen-Makefile.snapshot.sh Mon Nov 23 17:28:55 2015 (r402286) @@ -0,0 +1,31 @@ +#!/bin/sh +# +# Simple script to fetch the latest commits via the github API. Requires +# curl and jq. Uses unauthenticated access which is ratelimited to 60 +# queries per hour. + +get_repo_sha() +{ + curl https://api.github.com/repos/llvm-mirror/$1/branches/master | \ + jq -r '.commit.sha' +} + +cat < Makefile.snapshot +# \$FreeBSD\$ +# +# Generated file! Do not edit! +# +# Generated by: files/gen-Makefile.snapshot.sh. +# +LLVM_MAJOR= 3.8 +LLVM_RELEASE= \${LLVM_MAJOR}.0 +SNAPDATE= $(date +%Y%m%d) + +LLVM_COMMIT= $(get_repo_sha llvm) +CLANG_COMMIT= $(get_repo_sha clang) +COMPILER_RT_COMMIT= $(get_repo_sha compiler-rt) +EXTRAS_COMMIT= $(get_repo_sha clang-tools-extra) +LLD_COMMIT= $(get_repo_sha lld) +LLDB_COMMIT= $(get_repo_sha lldb) +OPENMP_COMMIT= $(get_repo_sha openmp) +EOF Modified: head/devel/llvm-devel/pkg-plist ============================================================================== --- head/devel/llvm-devel/pkg-plist Mon Nov 23 17:00:18 2015 (r402285) +++ head/devel/llvm-devel/pkg-plist Mon Nov 23 17:28:55 2015 (r402286) @@ -26,6 +26,8 @@ bin/llvm-symbolizer-devel bin/llvm-tblgen-devel bin/macho-dump-devel bin/opt-devel +bin/sancov-devel +%%CLANG%%bin/c-index-test-devel %%CLANG%%bin/clang-devel %%CLANG%%bin/clang++-devel %%CLANG%%bin/clang-check-devel @@ -38,6 +40,7 @@ bin/opt-devel %%EXTRAS%%bin/clang-query-devel %%EXTRAS%%bin/clang-rename-devel %%EXTRAS%%bin/clang-tidy-devel +%%EXTRAS%%bin/modularize-devel %%LLD%%bin/lld-devel %%LLD%%bin/lld-link-devel %%LLDB%%bin/lldb-devel @@ -50,9 +53,8 @@ bin/opt-devel %%LIT%%llvm-devel/bin/llvm-lit %%LIT%%bin/FileCheck-devel %%LIT%%llvm-devel/bin/FileCheck -%%CLANG%%llvm-devel/bin/Reporter.py -%%CLANG%%llvm-devel/bin/ScanView.py llvm-devel/bin/bugpoint +%%CLANG%%llvm-devel/bin/c-index-test %%CLANG%%llvm-devel/bin/clang %%CLANG%%llvm-devel/bin/clang++ %%CLANG%%llvm-devel/bin/clang-3.8 @@ -66,7 +68,7 @@ llvm-devel/bin/bugpoint %%EXTRAS%%llvm-devel/bin/clang-rename %%EXTRAS%%llvm-devel/bin/clang-tidy %%CLANG%%llvm-devel/bin/git-clang-format -%%LLD%%llvm-devel/bin/ld.lld2 +%%LLD%%llvm-devel/bin/ld.lld llvm-devel/bin/llc %%LLD%%llvm-devel/bin/lld %%LLD%%llvm-devel/bin/lld-link @@ -107,13 +109,12 @@ llvm-devel/bin/llvm-split llvm-devel/bin/llvm-stress llvm-devel/bin/llvm-symbolizer llvm-devel/bin/llvm-tblgen +%%EXTRAS%%llvm-devel/bin/modularize llvm-devel/bin/obj2yaml llvm-devel/bin/opt +llvm-devel/bin/sancov %%CLANG%%llvm-devel/bin/scan-build %%CLANG%%llvm-devel/bin/scan-view -%%CLANG%%llvm-devel/bin/scanview.css -%%CLANG%%llvm-devel/bin/sorttable.js -%%CLANG%%llvm-devel/bin/startfile.py llvm-devel/bin/verify-uselistorder llvm-devel/bin/yaml2obj %%CLANG%%llvm-devel/include/clang-c/BuildSystem.h @@ -1348,6 +1349,7 @@ llvm-devel/include/llvm/DebugInfo/DWARF/ llvm-devel/include/llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h llvm-devel/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h llvm-devel/include/llvm/DebugInfo/DWARF/DWARFDebugLoc.h +llvm-devel/include/llvm/DebugInfo/DWARF/DWARFDebugMacro.h llvm-devel/include/llvm/DebugInfo/DWARF/DWARFDebugRangeList.h llvm-devel/include/llvm/DebugInfo/DWARF/DWARFFormValue.h llvm-devel/include/llvm/DebugInfo/DWARF/DWARFRelocMap.h @@ -1444,6 +1446,8 @@ llvm-devel/include/llvm/ExecutionEngine/ llvm-devel/include/llvm/IR/Argument.h llvm-devel/include/llvm/IR/AssemblyAnnotationWriter.h llvm-devel/include/llvm/IR/Attributes.h +llvm-devel/include/llvm/IR/Attributes.inc +llvm-devel/include/llvm/IR/Attributes.td llvm-devel/include/llvm/IR/AutoUpgrade.h llvm-devel/include/llvm/IR/BasicBlock.h llvm-devel/include/llvm/IR/CFG.h @@ -1865,6 +1869,7 @@ llvm-devel/lib/LLVMHello.so %%CLANG%%llvm-devel/lib/clang/3.8.0/include/bmiintrin.h %%CLANG%%llvm-devel/lib/clang/3.8.0/include/cpuid.h %%CLANG%%llvm-devel/lib/clang/3.8.0/include/cuda_builtin_vars.h +%%CLANG%%llvm-devel/lib/clang/3.8.0/include/cuda_runtime.h %%CLANG%%llvm-devel/lib/clang/3.8.0/include/emmintrin.h %%CLANG%%llvm-devel/lib/clang/3.8.0/include/f16cintrin.h %%CLANG%%llvm-devel/lib/clang/3.8.0/include/float.h @@ -2175,7 +2180,7 @@ llvm-devel/lib/libLTO.so %%LLDB%%llvm-devel/lib/python2.7/site-packages/lldb/runtime/__init__.py %%LLDB%%llvm-devel/lib/python2.7/site-packages/lldb/utils/__init__.py %%LLDB%%llvm-devel/lib/python2.7/site-packages/lldb/utils/symbolication.py -%%CLANG%%llvm-devel/lib/python2.7/site-packages/six.py +%%LLDB%%llvm-devel/lib/python2.7/site-packages/six.py %%CLANG%%llvm-devel/libexec/c++-analyzer %%CLANG%%llvm-devel/libexec/ccc-analyzer %%CLANG%%llvm-devel/share/clang/clang-format-bbedit.applescript @@ -2209,9 +2214,14 @@ llvm-devel/share/llvm/cmake/LLVMExternal llvm-devel/share/llvm/cmake/LLVMInstallSymlink.cmake llvm-devel/share/llvm/cmake/LLVMProcessSources.cmake llvm-devel/share/llvm/cmake/TableGen.cmake +%%CLANG%%llvm-devel/share/scan-build/scanview.css +%%CLANG%%llvm-devel/share/scan-build/sorttable.js %%CLANG%%llvm-devel/share/scan-view/FileRadar.scpt %%CLANG%%llvm-devel/share/scan-view/GetRadarVersion.scpt +%%CLANG%%llvm-devel/share/scan-view/Reporter.py +%%CLANG%%llvm-devel/share/scan-view/ScanView.py %%CLANG%%llvm-devel/share/scan-view/bugcatcher.ico +%%CLANG%%llvm-devel/share/scan-view/startfile.py %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/LitConfig.py %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/LitTestCase.py %%LIT%%%%PYTHON_SITELIBDIR%%/lit-devel/ProgressBar.py