Date: Wed, 20 Sep 2017 01:08:58 +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: r450182 - in head/devel/llvm-devel: . files Message-ID: <201709200108.v8K18wCH052322@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Wed Sep 20 01:08:57 2017 New Revision: 450182 URL: https://svnweb.freebsd.org/changeset/ports/450182 Log: Update to a new snapshot. Fix location of compiler_rt libraries. [0] Fix hardcoded clang-format version. [1] PR: 216950 [0], 220995 [1] Added: head/devel/llvm-devel/files/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py - copied unchanged from r450176, head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py head/devel/llvm-devel/files/clang-patch-tools_clang_tools_clang-format_clang-format.py - copied unchanged from r450176, head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_clang-format.py head/devel/llvm-devel/files/clang-patch-tools_clang_tools_clang-format_git-clang-format - copied unchanged from r450176, head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_git-clang-format Modified: 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/llvm-devel/Makefile ============================================================================== --- head/devel/llvm-devel/Makefile Wed Sep 20 00:12:59 2017 (r450181) +++ head/devel/llvm-devel/Makefile Wed Sep 20 01:08:57 2017 (r450182) @@ -60,6 +60,9 @@ CLANG_DESC= Build clang CLANG_EXTRA_PATCHES= \ ${PATCHDIR}/clang-patch-fformat_extensions.diff \ ${PATCHDIR}/clang-patch-fopenmp.diff \ + ${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_clang-format.py \ + ${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py \ + ${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_git-clang-format \ ${PATCHDIR}/clang-patch-tools_clang_lib_Headers_CMakeLists.txt CLANG_CONFLICTS_INSTALL= clang-devel-3.[1234567]* CLANG_GH_PROJECT= clang:clang @@ -261,7 +264,7 @@ CMAKE_BUILD_TYPE= RelWithDebInfo STRIP= .endif -_CRTLIBDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/freebsd +_CRTLIBDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd .if ${ARCH} == "amd64" _COMPILER_RT_LIBS= \ libclang_rt.asan-preinit-x86_64.a \ @@ -332,6 +335,12 @@ post-patch: ${REINPLACE_CMD} -e 's,/usr/local/,${LOCALBASE}/,' \ ${WRKSRC}/CMakeLists.txt +post-patch-CLANG-on: + ${REINPLACE_CMD} -e 's|%%LLVM_SUFFIX%%|${LLVM_SUFFIX}|' \ + ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format.py \ + ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format-sublime.py \ + ${PATCH_WRKSRC}/tools/clang/tools/clang-format/git-clang-format + post-build-COMPILER_RT-on: ${MKDIR} ${WRKDIR}/compiler-rt-build cd ${WRKDIR}/compiler-rt-build && \ @@ -374,10 +383,14 @@ post-install-CLANG-on: post-install-COMPILER_RT-on: cd ${WRKDIR}/compiler-rt-build && \ - ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET} + ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET} .if ${ARCH} == "amd64" ${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd/libclang_rt*i386* .endif + ${MKDIR} ${STAGEDIR}${PREFIX}/${_CRTLIBDIR} + ${MV} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd/* \ + ${STAGEDIR}${PREFIX}/${_CRTLIBDIR} + ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd post-install-LIT-on: ${INSTALL_SCRIPT} ${PATCH_WRKSRC}/utils/lit/lit.py \ Modified: head/devel/llvm-devel/Makefile.snapshot ============================================================================== --- head/devel/llvm-devel/Makefile.snapshot Wed Sep 20 00:12:59 2017 (r450181) +++ head/devel/llvm-devel/Makefile.snapshot Wed Sep 20 01:08:57 2017 (r450182) @@ -6,12 +6,12 @@ # LLVM_MAJOR= 6.0 LLVM_RELEASE= ${LLVM_MAJOR}.0 -SNAPDATE= 20170914 +SNAPDATE= 20170920 -LLVM_COMMIT= 5cf5798b90e622f8b2db6b9e166bc404082c2c0e -CLANG_COMMIT= 1af16988a3734bcb5dccd5b70a5b75b32402a25a -COMPILER_RT_COMMIT= ee5ce553a0e466226246bde2390c6d18f06bcf86 -EXTRAS_COMMIT= 9ecb069c91d05a70047f812671637d91d79d673b -LLD_COMMIT= 072cd4c801fabf766e8150930e8b2d31643826d4 -LLDB_COMMIT= 347436e1db527ad935fe3276373593a1f7bf0f5a +LLVM_COMMIT= 7098cc87ae02d1a721cc456c11ab068f5e2ced66 +CLANG_COMMIT= 2351bad637c04876207215c47e9a07f315246b87 +COMPILER_RT_COMMIT= 0feb616cb30a9d33d74edfa143525a6df126a61f +EXTRAS_COMMIT= 69157d1b22db178ff418fc3b073017979f5f4289 +LLD_COMMIT= 667d193bb4a336d8d7007d635af3e94c7a2a3160 +LLDB_COMMIT= 477588184f6fafa829912fa35a5c02bcb047006c OPENMP_COMMIT= 31535f3451001f4b5f3e56810935a617e165a5b4 Modified: head/devel/llvm-devel/distinfo ============================================================================== --- head/devel/llvm-devel/distinfo Wed Sep 20 00:12:59 2017 (r450181) +++ head/devel/llvm-devel/distinfo Wed Sep 20 01:08:57 2017 (r450182) @@ -1,15 +1,15 @@ -TIMESTAMP = 1505417675 -SHA256 (llvm-mirror-llvm-6.0.d20170914-5cf5798b90e622f8b2db6b9e166bc404082c2c0e_GH0.tar.gz) = e33c77830434d4ec1e9082c5e92d6f6c050a759d038bf9648df32da837fa8a25 -SIZE (llvm-mirror-llvm-6.0.d20170914-5cf5798b90e622f8b2db6b9e166bc404082c2c0e_GH0.tar.gz) = 35945863 -SHA256 (llvm-mirror-clang-1af16988a3734bcb5dccd5b70a5b75b32402a25a_GH0.tar.gz) = 6b8dcb4d32071bc1742b261bf3cf31f9cf67b0296338d759d9429fc21a574c6a -SIZE (llvm-mirror-clang-1af16988a3734bcb5dccd5b70a5b75b32402a25a_GH0.tar.gz) = 16174736 -SHA256 (llvm-mirror-compiler-rt-ee5ce553a0e466226246bde2390c6d18f06bcf86_GH0.tar.gz) = 21a558e3a9a8943ca54510cd1db393219a761b185dd8e05ada84f6c4cf6bec8c -SIZE (llvm-mirror-compiler-rt-ee5ce553a0e466226246bde2390c6d18f06bcf86_GH0.tar.gz) = 2813201 -SHA256 (llvm-mirror-clang-tools-extra-9ecb069c91d05a70047f812671637d91d79d673b_GH0.tar.gz) = 00b9370a230ce841e0566f605e8c6f09153af2e1b8d8f376b0b2d58e4021f322 -SIZE (llvm-mirror-clang-tools-extra-9ecb069c91d05a70047f812671637d91d79d673b_GH0.tar.gz) = 910219 -SHA256 (llvm-mirror-lld-072cd4c801fabf766e8150930e8b2d31643826d4_GH0.tar.gz) = aec37f9225ec82ef23d2ce6f4096f037041c8a6e5523ab34002c28dd3dcfa249 -SIZE (llvm-mirror-lld-072cd4c801fabf766e8150930e8b2d31643826d4_GH0.tar.gz) = 930453 -SHA256 (llvm-mirror-lldb-347436e1db527ad935fe3276373593a1f7bf0f5a_GH0.tar.gz) = 2c8e9d61a76e9d90527e6a41561650836c0061409d39d0558652b4031f1c0079 -SIZE (llvm-mirror-lldb-347436e1db527ad935fe3276373593a1f7bf0f5a_GH0.tar.gz) = 24220945 +TIMESTAMP = 1505867914 +SHA256 (llvm-mirror-llvm-6.0.d20170920-7098cc87ae02d1a721cc456c11ab068f5e2ced66_GH0.tar.gz) = f40ff711035cea09fbfc6c50c2baf55d795a2b0a4a197f2c73e8f65662e663c7 +SIZE (llvm-mirror-llvm-6.0.d20170920-7098cc87ae02d1a721cc456c11ab068f5e2ced66_GH0.tar.gz) = 36000764 +SHA256 (llvm-mirror-clang-2351bad637c04876207215c47e9a07f315246b87_GH0.tar.gz) = 73bc8915594c6eaf4a21a990c2c53fef861e1acb48da0246e1bab372729d4527 +SIZE (llvm-mirror-clang-2351bad637c04876207215c47e9a07f315246b87_GH0.tar.gz) = 16182622 +SHA256 (llvm-mirror-compiler-rt-0feb616cb30a9d33d74edfa143525a6df126a61f_GH0.tar.gz) = 1e467915d1f61e8babc54ad253ce80a730f694f5ff4cb5570a3d900173eb460c +SIZE (llvm-mirror-compiler-rt-0feb616cb30a9d33d74edfa143525a6df126a61f_GH0.tar.gz) = 2813797 +SHA256 (llvm-mirror-clang-tools-extra-69157d1b22db178ff418fc3b073017979f5f4289_GH0.tar.gz) = 54e208e79baf24705b5cc57059a6310a80b86a80215cc758508dce7212ec4621 +SIZE (llvm-mirror-clang-tools-extra-69157d1b22db178ff418fc3b073017979f5f4289_GH0.tar.gz) = 910709 +SHA256 (llvm-mirror-lld-667d193bb4a336d8d7007d635af3e94c7a2a3160_GH0.tar.gz) = 4494ee2a714a619df98738006e7abf1e5d111aa4799774daa778fa74a33bedca +SIZE (llvm-mirror-lld-667d193bb4a336d8d7007d635af3e94c7a2a3160_GH0.tar.gz) = 931027 +SHA256 (llvm-mirror-lldb-477588184f6fafa829912fa35a5c02bcb047006c_GH0.tar.gz) = 7a8b9012c4fd0628c484a107deb8dd0f92bf6de7ee18041ac5f519a3764ae3a9 +SIZE (llvm-mirror-lldb-477588184f6fafa829912fa35a5c02bcb047006c_GH0.tar.gz) = 24239016 SHA256 (llvm-mirror-openmp-31535f3451001f4b5f3e56810935a617e165a5b4_GH0.tar.gz) = 42b6a04f60c07da37492671affc4909044043a444736488f9adb23f7ea0e6fca SIZE (llvm-mirror-openmp-31535f3451001f4b5f3e56810935a617e165a5b4_GH0.tar.gz) = 2895110 Copied: head/devel/llvm-devel/files/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py (from r450176, head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm-devel/files/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py Wed Sep 20 01:08:57 2017 (r450182, copy of r450176, head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_clang-format-sublime.py) @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- tools/clang/tools/clang-format/clang-format-sublime.py.orig ++++ tools/clang/tools/clang-format/clang-format-sublime.py +@@ -18,7 +18,7 @@ + import subprocess + + # Change this to the full path if clang-format is not on the path. +-binary = 'clang-format' ++binary = 'clang-format%%LLVM_SUFFIX%%' + + # Change this to format according to other formatting styles. See the output of + # 'clang-format --help' for a list of supported styles. The default looks for Copied: head/devel/llvm-devel/files/clang-patch-tools_clang_tools_clang-format_clang-format.py (from r450176, head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_clang-format.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm-devel/files/clang-patch-tools_clang_tools_clang-format_clang-format.py Wed Sep 20 01:08:57 2017 (r450182, copy of r450176, head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_clang-format.py) @@ -0,0 +1,11 @@ +--- tools/clang/tools/clang-format/clang-format.py.orig 2015-09-08 20:44:00 UTC ++++ tools/clang/tools/clang-format/clang-format.py +@@ -34,7 +34,7 @@ import vim + + # set g:clang_format_path to the path to clang-format if it is not on the path + # Change this to the full path if clang-format is not on the path. +-binary = 'clang-format' ++binary = 'clang-format%%LLVM_SUFFIX%%' + if vim.eval('exists("g:clang_format_path")') == "1": + binary = vim.eval('g:clang_format_path') + Copied: head/devel/llvm-devel/files/clang-patch-tools_clang_tools_clang-format_git-clang-format (from r450176, head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_git-clang-format) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm-devel/files/clang-patch-tools_clang_tools_clang-format_git-clang-format Wed Sep 20 01:08:57 2017 (r450182, copy of r450176, head/devel/llvm50/files/clang-patch-tools_clang_tools_clang-format_git-clang-format) @@ -0,0 +1,32 @@ + +$FreeBSD$ + +--- tools/clang/tools/clang-format/git-clang-format.orig ++++ tools/clang/tools/clang-format/git-clang-format +@@ -90,7 +90,7 @@ + usage=usage, formatter_class=argparse.RawDescriptionHelpFormatter, + description=desc) + p.add_argument('--binary', +- default=config.get('clangformat.binary', 'clang-format'), ++ default=config.get('clangformat.binary', 'clang-format%%LLVM_SUFFIX%%'), + help='path to clang-format'), + p.add_argument('--commit', + default=config.get('clangformat.commit', 'HEAD'), +@@ -344,7 +344,7 @@ + + + def run_clang_format_and_save_to_tree(changed_lines, revision=None, +- binary='clang-format', style=None): ++ binary='clang-format%%LLVM_SUFFIX%%', style=None): + """Run clang-format on each file and save the result to a git tree. + + Returns the object ID (SHA-1) of the created tree.""" +@@ -397,7 +397,7 @@ + + + def clang_format_to_blob(filename, line_ranges, revision=None, +- binary='clang-format', style=None): ++ binary='clang-format%%LLVM_SUFFIX%%', style=None): + """Run clang-format on the given file and save the result to a git blob. + + Runs on the file in `revision` if not None, or on the file in the working Modified: head/devel/llvm-devel/pkg-plist ============================================================================== --- head/devel/llvm-devel/pkg-plist Wed Sep 20 00:12:59 2017 (r450181) +++ head/devel/llvm-devel/pkg-plist Wed Sep 20 01:08:57 2017 (r450182) @@ -67,6 +67,7 @@ bin/sancov-devel %%EXTRAS%%bin/clang-tidy-devel %%EXTRAS%%bin/find-all-symbols-devel %%EXTRAS%%bin/modularize-devel +%%EXTRAS%%bin/pp-trace-devel %%LLD%%bin/lld-devel %%LLD%%bin/lld-link-devel %%LIT%%bin/lit-devel @@ -722,6 +723,7 @@ llvm-devel/bin/yaml2obj %%LLDB%%llvm-devel/include/lldb/Breakpoint/BreakpointLocation.h %%LLDB%%llvm-devel/include/lldb/Breakpoint/BreakpointLocationCollection.h %%LLDB%%llvm-devel/include/lldb/Breakpoint/BreakpointLocationList.h +%%LLDB%%llvm-devel/include/lldb/Breakpoint/BreakpointName.h %%LLDB%%llvm-devel/include/lldb/Breakpoint/BreakpointOptions.h %%LLDB%%llvm-devel/include/lldb/Breakpoint/BreakpointResolver.h %%LLDB%%llvm-devel/include/lldb/Breakpoint/BreakpointResolverAddress.h @@ -871,6 +873,7 @@ llvm-devel/bin/yaml2obj %%LLDB%%llvm-devel/include/lldb/Host/SocketAddress.h %%LLDB%%llvm-devel/include/lldb/Host/StringConvert.h %%LLDB%%llvm-devel/include/lldb/Host/Symbols.h +%%LLDB%%llvm-devel/include/lldb/Host/TaskPool.h %%LLDB%%llvm-devel/include/lldb/Host/Terminal.h %%LLDB%%llvm-devel/include/lldb/Host/ThreadLauncher.h %%LLDB%%llvm-devel/include/lldb/Host/Time.h @@ -1110,7 +1113,6 @@ llvm-devel/bin/yaml2obj %%LLDB%%llvm-devel/include/lldb/Utility/StringLexer.h %%LLDB%%llvm-devel/include/lldb/Utility/StringList.h %%LLDB%%llvm-devel/include/lldb/Utility/StructuredData.h -%%LLDB%%llvm-devel/include/lldb/Utility/TaskPool.h %%LLDB%%llvm-devel/include/lldb/Utility/TildeExpressionResolver.h %%LLDB%%llvm-devel/include/lldb/Utility/Timeout.h %%LLDB%%llvm-devel/include/lldb/Utility/Timer.h @@ -1729,6 +1731,7 @@ llvm-devel/include/llvm/IR/DebugInfoMetadata.h llvm-devel/include/llvm/IR/DebugLoc.h llvm-devel/include/llvm/IR/DerivedTypes.h llvm-devel/include/llvm/IR/DerivedUser.h +llvm-devel/include/llvm/IR/DiagnosticHandler.h llvm-devel/include/llvm/IR/DiagnosticInfo.h llvm-devel/include/llvm/IR/DiagnosticPrinter.h llvm-devel/include/llvm/IR/Dominators.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709200108.v8K18wCH052322>