diff options
| -rw-r--r-- | devel/llvm38/Makefile | 5 | ||||
| -rw-r--r-- | devel/llvm38/distinfo | 24 | ||||
| -rw-r--r-- | devel/llvm38/files/clang-patch-tools_clang_tools_clang-format_clang-format.py | 2 | ||||
| -rw-r--r-- | devel/llvm38/files/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer | 15 | ||||
| -rw-r--r-- | devel/llvm38/pkg-plist | 2 |
5 files changed, 32 insertions, 16 deletions
diff --git a/devel/llvm38/Makefile b/devel/llvm38/Makefile index 44d313499dc6..51d502aa2784 100644 --- a/devel/llvm38/Makefile +++ b/devel/llvm38/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= llvm -DISTVERSION= 3.8.0rc2 +DISTVERSION= 3.8.0rc3 CATEGORIES= devel lang MASTER_SITES= http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR} DISTNAME= ${PORTNAME}-${DISTVERSION}.src @@ -40,7 +40,8 @@ CLANG_DESC= Build clang CLANG_EXTRA_PATCHES= \ ${PATCHDIR}/clang-patch-fformat_extensions.diff \ ${PATCHDIR}/clang-patch-tools_clang_lib_Headers_CMakeLists.txt \ - ${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_clang-format.py + ${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_clang-format.py \ + ${PATCHDIR}/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer CLANG_CONFLICTS_INSTALL= clang-devel-3.[1234567]* CLANG_DISTFILES= cfe-${DISTVERSION}.src${EXTRACT_SUFX} CLANG_CMAKE_ON= -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp diff --git a/devel/llvm38/distinfo b/devel/llvm38/distinfo index ac55ee971668..c6e20ef43ce6 100644 --- a/devel/llvm38/distinfo +++ b/devel/llvm38/distinfo @@ -1,12 +1,12 @@ -SHA256 (llvm-3.8.0rc2.src.tar.xz) = 8141ba68fde29e213fb82886b58b722d9c2aa2179116d1e7f8a7d6de23508047 -SIZE (llvm-3.8.0rc2.src.tar.xz) = 16567192 -SHA256 (cfe-3.8.0rc2.src.tar.xz) = 94b0e158a31573c4bb47b872fea08c49f4e6754a4de2bacdc20db231c9ace9b6 -SIZE (cfe-3.8.0rc2.src.tar.xz) = 9623976 -SHA256 (clang-tools-extra-3.8.0rc2.src.tar.xz) = 86cc4fdeb64c7d95dd6bb354edff5d3b590366d560dc23d48e7986c3c45a5465 -SIZE (clang-tools-extra-3.8.0rc2.src.tar.xz) = 334256 -SHA256 (lld-3.8.0rc2.src.tar.xz) = 03c328d2d126b65dae2619b9195a4177818c8451d5b843bbc4110c300bcd1a23 -SIZE (lld-3.8.0rc2.src.tar.xz) = 631500 -SHA256 (lldb-3.8.0rc2.src.tar.xz) = a89128fb15b4e445cbb6ed23189acd4c7ad18be0bc9cb92234d977e927dadf71 -SIZE (lldb-3.8.0rc2.src.tar.xz) = 10931040 -SHA256 (openmp-3.8.0rc2.src.tar.xz) = b1886405293183a01675f3a366f266bd360b1c9660c3d42bd7fe8c46b55f7eca -SIZE (openmp-3.8.0rc2.src.tar.xz) = 2233400 +SHA256 (llvm-3.8.0rc3.src.tar.xz) = 8483d0691fe3f305f64c87a3d84c7a1eb340441f9f423402fd4fa448160b2c52 +SIZE (llvm-3.8.0rc3.src.tar.xz) = 16579932 +SHA256 (cfe-3.8.0rc3.src.tar.xz) = 33fbf5a885743e80873a78044c25ed65895c9ab88875d51d2b846ef3eccd0c43 +SIZE (cfe-3.8.0rc3.src.tar.xz) = 9627084 +SHA256 (clang-tools-extra-3.8.0rc3.src.tar.xz) = f4334f7e417905ae018276ae676abe496417874fe05582381594ce0a34c7eceb +SIZE (clang-tools-extra-3.8.0rc3.src.tar.xz) = 334240 +SHA256 (lld-3.8.0rc3.src.tar.xz) = e64e8f5eb64db31837d4d20786f502e955a91fbe10c29d209933fea5cdeadc55 +SIZE (lld-3.8.0rc3.src.tar.xz) = 631532 +SHA256 (lldb-3.8.0rc3.src.tar.xz) = bf20c4eb6c84289cd7b52feb12ad9479888b0aa395a670099d68cbafa6039e79 +SIZE (lldb-3.8.0rc3.src.tar.xz) = 10930276 +SHA256 (openmp-3.8.0rc3.src.tar.xz) = 59d9865acbc576ca49c9306e3cc55594a637e845184477e80d91c5cfea00628d +SIZE (openmp-3.8.0rc3.src.tar.xz) = 2233828 diff --git a/devel/llvm38/files/clang-patch-tools_clang_tools_clang-format_clang-format.py b/devel/llvm38/files/clang-patch-tools_clang_tools_clang-format_clang-format.py index 9cb21db628f5..74fe7fbfdbc6 100644 --- a/devel/llvm38/files/clang-patch-tools_clang_tools_clang-format_clang-format.py +++ b/devel/llvm38/files/clang-patch-tools_clang_tools_clang-format_clang-format.py @@ -5,7 +5,7 @@ # 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-format37' ++binary = 'clang-format38' if vim.eval('exists("g:clang_format_path")') == "1": binary = vim.eval('g:clang_format_path') diff --git a/devel/llvm38/files/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer b/devel/llvm38/files/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer new file mode 100644 index 000000000000..76d6a06db7c6 --- /dev/null +++ b/devel/llvm38/files/clang-patch-tools_clang_tools_scan-build_libexec_ccc-analyzer @@ -0,0 +1,15 @@ + +$FreeBSD$ + +--- tools/clang/tools/scan-build/libexec/ccc-analyzer.orig ++++ tools/clang/tools/scan-build/libexec/ccc-analyzer +@@ -81,6 +81,9 @@ + if (-x "/usr/bin/xcrun") { + $UseXCRUN = 1; + } ++} elsif (`uname -s` == "FreeBSD") { ++ $DefaultCCompiler = 'cc'; ++ $DefaultCXXCompiler = 'c++'; + } else { + $DefaultCCompiler = 'gcc'; + $DefaultCXXCompiler = 'g++'; diff --git a/devel/llvm38/pkg-plist b/devel/llvm38/pkg-plist index 8b28540daa67..903425759d95 100644 --- a/devel/llvm38/pkg-plist +++ b/devel/llvm38/pkg-plist @@ -34,7 +34,6 @@ bin/opt38 %%CLANG%%bin/clang-tblgen38 %%CLANG%%bin/scan-build38 %%CLANG%%bin/scan-view38 -%%LLD%%bin/lld38 %%LLDB%%bin/argdumper38 %%LLDB%%bin/lldb38 %%LLDB%%bin/lldb-mi38 @@ -45,6 +44,7 @@ bin/opt38 %%EXTRAS%%bin/clang-rename38 %%EXTRAS%%bin/clang-tidy38 %%EXTRAS%%bin/modularize38 +%%LLD%%bin/lld38 %%LIT%%bin/lit38 %%LIT%%llvm38/bin/lit %%LIT%%bin/llvm-lit38 |