Upgrade to 3.7.0 rc2.

Attempt to allow builds with gcc on DragonFly.

4 files changed, 17 insertions, 17 deletions

diff --git a/devel/llvm37/Makefile b/devel/llvm37/Makefile
index defa73911817..3e02efbf5907 100644
--- a/devel/llvm37/Makefile
+++ b/devel/llvm37/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	llvm
-DISTVERSION=	3.7.0rc1
-PORTREVISION=	1
+DISTVERSION=	3.7.0rc2
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}
 DISTNAME=	${PORTNAME}-${DISTVERSION}.src
@@ -159,7 +158,7 @@ NOT_FOR_ARCH=	ia64
 
 .include <bsd.port.pre.mk>
 
-.if ${COMPILER_TYPE} != clang
+.if ${OPSYS} == "FreeBSD" && ${COMPILER_TYPE} != clang
 # Evil hack around gcc48 not providing a usable c++11 environment on 9.x
 PLIST_SUB:=	${PLIST_SUB:NLLDB=*} LLDB="@comment "
 .endif
@@ -171,7 +170,7 @@ post-extract-LLD-on:
 	${MV} ${WRKSRC_lld} ${PATCH_WRKSRC}/tools/lld
 
 post-extract-LLDB-on:
-.if ${COMPILER_TYPE} == clang
+.if ${OPSYS} != "FreeBSD" || ${COMPILER_TYPE} == clang
 	${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb
 .endif
 
@@ -207,7 +206,7 @@ post-install-DOCS-on:
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
 
 post-install-LLDB-on:
-.if ${COMPILER_TYPE} == clang
+.if ${OPSYS} != "FreeBSD" || ${COMPILER_TYPE} == clang
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib
 .endif
 
diff --git a/devel/llvm37/distinfo b/devel/llvm37/distinfo
index 8f091be783aa..2ef9831b4a53 100644
--- a/devel/llvm37/distinfo
+++ b/devel/llvm37/distinfo
@@ -1,10 +1,10 @@
-SHA256 (llvm-3.7.0rc1.src.tar.xz) = 79059af9e5a3e2c4daad5be2444af773a915d9982f6f86756d8e1add24f62e35
-SIZE (llvm-3.7.0rc1.src.tar.xz) = 14619256
-SHA256 (cfe-3.7.0rc1.src.tar.xz) = 30dd39f3268bcda85bd5972a820e61aa15efd0352d4c183e2551bdc1777c6cd2
-SIZE (cfe-3.7.0rc1.src.tar.xz) = 9101300
-SHA256 (lld-3.7.0rc1.src.tar.xz) = 905ca113556ad7a88955a601fd97f92a7323b339bf4f614057eab2bd6a9e6b37
-SIZE (lld-3.7.0rc1.src.tar.xz) = 586180
-SHA256 (lldb-3.7.0rc1.src.tar.xz) = 0b4318a7c9dc326aa5f727b0296ee37d2d03ad824f5a9ac11eaa9818bb94920c
-SIZE (lldb-3.7.0rc1.src.tar.xz) = 10646600
-SHA256 (openmp-3.7.0rc1.src.tar.xz) = 34e5752bcd9addda9bb04a12c3f2a9e999e28baefb809f068c83e2e4c3acddfb
-SIZE (openmp-3.7.0rc1.src.tar.xz) = 2251260
+SHA256 (llvm-3.7.0rc2.src.tar.xz) = 36a79ba3198afb5c973d89ec2e4ef1d4587d97fa3b3f51fb1badcd7c0c868213
+SIZE (llvm-3.7.0rc2.src.tar.xz) = 14624620
+SHA256 (cfe-3.7.0rc2.src.tar.xz) = a371a416af039eec9291b9acc167911ad9c8d9f3494111c8e53beb07b7f5dfaa
+SIZE (cfe-3.7.0rc2.src.tar.xz) = 9141532
+SHA256 (lld-3.7.0rc2.src.tar.xz) = 849a99def4c4ccc1639989d7296680fe36b845391a728a0cb75b41e91a9fc9c4
+SIZE (lld-3.7.0rc2.src.tar.xz) = 586280
+SHA256 (lldb-3.7.0rc2.src.tar.xz) = 56a3e14de7568f1fa151f7d1af014dfc4f54e589c062ba04b2d9b7ae1f28e1ae
+SIZE (lldb-3.7.0rc2.src.tar.xz) = 10645800
+SHA256 (openmp-3.7.0rc2.src.tar.xz) = 0a23f842d92dd7a434b5725f9bee5dec7493131589abcfdbc0c54cfec7b04696
+SIZE (openmp-3.7.0rc2.src.tar.xz) = 2250736
diff --git a/devel/llvm37/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt b/devel/llvm37/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt
index 21bf0f11139c..975a119b4587 100644
--- a/devel/llvm37/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt
+++ b/devel/llvm37/files/clang-patch-tools_clang_lib_Headers_CMakeLists.txt
@@ -1,4 +1,4 @@
---- tools/clang/lib/Headers/CMakeLists.txt.orig	2015-07-21 15:57:35 UTC
+--- tools/clang/lib/Headers/CMakeLists.txt.orig	2015-07-30 22:47:41 UTC
 +++ tools/clang/lib/Headers/CMakeLists.txt
 @@ -30,7 +30,6 @@ set(files
    Intrin.h
@@ -26,6 +26,6 @@
    unwind.h
    vadefs.h
 -  varargs.h
+   vecintrin.h
    __wmmintrin_aes.h
    wmmintrin.h
-   __wmmintrin_pclmul.h
diff --git a/devel/llvm37/pkg-plist b/devel/llvm37/pkg-plist
index d678a2dd4389..c48a2c7627ac 100644
--- a/devel/llvm37/pkg-plist
+++ b/devel/llvm37/pkg-plist
@@ -1830,6 +1830,7 @@ llvm37/lib/LLVMHello.so
 %%CLANG%%llvm37/lib/clang/3.7.0/include/tmmintrin.h
 %%CLANG%%llvm37/lib/clang/3.7.0/include/unwind.h
 %%CLANG%%llvm37/lib/clang/3.7.0/include/vadefs.h
+%%CLANG%%llvm37/lib/clang/3.7.0/include/vecintrin.h
 %%CLANG%%llvm37/lib/clang/3.7.0/include/wmmintrin.h
 %%CLANG%%llvm37/lib/clang/3.7.0/include/x86intrin.h
 %%CLANG%%llvm37/lib/clang/3.7.0/include/xmmintrin.h