From ff69958b017e8fabc4f9457b8d714ce67be54b46 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Sat, 17 Dec 2016 23:28:34 +0000
Subject: Explicitly build LLVM projects with -std=c++11, it doesn't get
 detected automatically in all cases.

---
 lang/clang/Makefile.common | 6 +++++-
 lang/clang/distinfo        | 6 +++++-
 lang/libLLVM/Makefile      | 6 +++++-
 lang/llvm/Makefile         | 6 +++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/lang/clang/Makefile.common b/lang/clang/Makefile.common
index beeddadba05..4a5b3e5abce 100644
--- a/lang/clang/Makefile.common
+++ b/lang/clang/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2016/11/14 20:15:33 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.16 2016/12/17 23:28:34 joerg Exp $
 # used by lang/clang/Makefile
 # used by lang/clang-static-analyzer/Makefile
 
@@ -113,6 +113,10 @@ CMAKE_ARGS+=		-DLLVM_INCLUDE_TESTS=OFF
 CMAKE_ARGS+=		-DCLANG_INCLUDE_TESTS=OFF
 .endif
 
+# At least LLVM 3.9.0 and subprojects don't correctly add C++11 flags
+# automatically.
+CXXFLAGS+=	-std=c++11
+
 post-extract:
 	${RUN} mkdir -p ${WRKDIR}/build
 
diff --git a/lang/clang/distinfo b/lang/clang/distinfo
index 51a1cbd45fb..51c5e78c59a 100644
--- a/lang/clang/distinfo
+++ b/lang/clang/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.43 2016/11/14 20:15:33 ryoon Exp $
+$NetBSD: distinfo,v 1.44 2016/12/17 23:28:34 joerg Exp $
 
 SHA1 (cfe-3.9.0.src.tar.xz) = 00d49ee82451130a8e1e7b1d56cffa37b783bcb2
 RMD160 (cfe-3.9.0.src.tar.xz) = a33d18142ce0fd69db59a96b75ffcfd20cef2f2c
 SHA512 (cfe-3.9.0.src.tar.xz) = f405b5819fd19276b2de4da80a51171a3b1c5c00df810e1f284184c693e410775fe2933576f942b881664dd3b75e78f0f15b7e5a3eca7819ffbcfe528d9a578e
 Size (cfe-3.9.0.src.tar.xz) = 10390440 bytes
+SHA1 (patch-docs_JSONCompilationDatabase.rst) = 97251a0f4dcd7b772f56dbc52d8b620ec33d1f75
+SHA1 (patch-include_clang_Driver_Options.td) = e67b312508539abb6ab8492aed0bf0ce6284c5b5
+SHA1 (patch-lib_Driver_Tools.cpp) = c58e13a270a6c2ebd6746d121fa186afda8fd23c
+SHA1 (patch-lib_Tooling_JSONCompilationDatabase.cpp) = 9f815011aa84198cf134d79d56091dff8488a24e
 SHA1 (patch-tools_clang-format_CMakeLists.txt) = 4efc9c9f69caf7df1dd0db384eae644c606c5ca9
diff --git a/lang/libLLVM/Makefile b/lang/libLLVM/Makefile
index 3196870e5fc..2ca9b5e0c24 100644
--- a/lang/libLLVM/Makefile
+++ b/lang/libLLVM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/11/14 20:15:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.14 2016/12/17 23:28:34 joerg Exp $
 
 DISTNAME=	llvm-3.9.0.src
 PKGNAME=	${DISTNAME:S/llvm/libLLVM/:S/.src//}
@@ -106,6 +106,10 @@ PLIST_SUBST+=	LLVM_LIBNAME=${LLVM_LIBNAME}
 
 .include "options.mk"
 
+# At least LLVM 3.9.0 and subprojects don't correctly add C++11 flags
+# automatically.
+CXXFLAGS+=	-std=c++11
+
 # replacing config.guess is required even for cmake.
 # It is used to detect correct LLVM_HOST_TRIPLE, e.g. for NetBSD/evbarm.
 post-extract:
diff --git a/lang/llvm/Makefile b/lang/llvm/Makefile
index 985d7a63e61..eafb81c5584 100644
--- a/lang/llvm/Makefile
+++ b/lang/llvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/11/15 16:41:36 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2016/12/17 23:28:34 joerg Exp $
 #
 # when updating this, please also update:
 # devel/include-what-you-use
@@ -88,6 +88,10 @@ SOEXT=		so
 .endif
 PLIST_SUBST+=	SOEXT=${SOEXT}
 
+# At least LLVM 3.9.0 and subprojects don't correctly add C++11 flags
+# automatically.
+CXXFLAGS+=	-std=c++11
+
 .if ${OPSYS} == "Darwin"
 .PHONY: fix-darwin-install-name
 post-install: fix-darwin-install-name
-- 
cgit v1.2.3