[pkgsrc/trunk]: pkgsrc/devel/include-what-you-use Update include-what-you-use...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8c9751ac93a4
branches:  trunk
changeset: 350367:8c9751ac93a4
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Jul 26 12:47:24 2016 +0000

description:
Update include-what-you-use to 0.6.

Compat update for clang/llvm 3.8.

diffstat:

 devel/include-what-you-use/Makefile                         |   5 +-
 devel/include-what-you-use/distinfo                         |  13 +-
 devel/include-what-you-use/patches/patch-CMakeLists.txt     |  14 --
 devel/include-what-you-use/patches/patch-iwyu__ast__util.cc |  72 -------------
 devel/include-what-you-use/patches/patch-iwyu__ast__util.h  |  15 --
 5 files changed, 7 insertions(+), 112 deletions(-)

diffs (145 lines):

diff -r 209ca2ac9cc3 -r 8c9751ac93a4 devel/include-what-you-use/Makefile
--- a/devel/include-what-you-use/Makefile       Tue Jul 26 12:46:38 2016 +0000
+++ b/devel/include-what-you-use/Makefile       Tue Jul 26 12:47:24 2016 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2016/07/05 00:19:59 maya Exp $
+# $NetBSD: Makefile,v 1.5 2016/07/26 12:47:24 wiz Exp $
 
-DISTNAME=      include-what-you-use-0.5.src
-PKGREVISION=   1
+DISTNAME=      include-what-you-use-0.6.src
 PKGNAME=       ${DISTNAME:.src=}
 CATEGORIES=    devel
 MASTER_SITES=  http://include-what-you-use.org/downloads/
diff -r 209ca2ac9cc3 -r 8c9751ac93a4 devel/include-what-you-use/distinfo
--- a/devel/include-what-you-use/distinfo       Tue Jul 26 12:46:38 2016 +0000
+++ b/devel/include-what-you-use/distinfo       Tue Jul 26 12:47:24 2016 +0000
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.2 2016/03/14 14:36:39 tnn Exp $
+$NetBSD: distinfo,v 1.3 2016/07/26 12:47:24 wiz Exp $
 
-SHA1 (include-what-you-use-0.5.src.tar.gz) = 6d4e3040ecb2906f93d72ba14e61381f0a8c2509
-RMD160 (include-what-you-use-0.5.src.tar.gz) = 73f92c5d018e9a49c34307a4ff5c5848b78a0e99
-SHA512 (include-what-you-use-0.5.src.tar.gz) = 805395873b59e4f4236853ba9ac6818d60968190ad485d580ea80d69c518eb8c44822a4281a4219b4ccc02e2dc8f3db5c470170e27e67ea0d8e04ef78da9078c
-Size (include-what-you-use-0.5.src.tar.gz) = 404081 bytes
-SHA1 (patch-CMakeLists.txt) = 08d51a0890df1382944bd35904d8171fb031dad5
-SHA1 (patch-iwyu__ast__util.cc) = 7fa08654fb9dfeb439d17f8ea095d816398724cd
-SHA1 (patch-iwyu__ast__util.h) = da1326a0f2423a3967025bf5274a80e7a1a44c0e
+SHA1 (include-what-you-use-0.6.src.tar.gz) = 71295c39e7374a9c139154ac12b252fb5e1305f9
+RMD160 (include-what-you-use-0.6.src.tar.gz) = d7001e1fd4043474e25db6579d286f3ce14f9e2a
+SHA512 (include-what-you-use-0.6.src.tar.gz) = 9dcc37666819084a0e084513c62599b8ffb6f9eb8a9de759d4b1e2813ae759f2aed2e2233fdc6428dc676668102b738fe7bd990561293626d9aa427849ccec35
+Size (include-what-you-use-0.6.src.tar.gz) = 434980 bytes
 SHA1 (patch-iwyu__output.cc) = 072236f94c44ebd7e0ca20ad828dd938c9683b4a
diff -r 209ca2ac9cc3 -r 8c9751ac93a4 devel/include-what-you-use/patches/patch-CMakeLists.txt
--- a/devel/include-what-you-use/patches/patch-CMakeLists.txt   Tue Jul 26 12:46:38 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2016/03/14 14:36:39 tnn Exp $
-
-fix build w/ llvm-3.8
-
---- CMakeLists.txt.orig        2015-12-11 05:46:10.000000000 +0000
-+++ CMakeLists.txt
-@@ -133,7 +133,6 @@ target_link_libraries(include-what-you-u
-   LLVMScalarOpts
-   LLVMInstCombine
-   LLVMTransformUtils
--  LLVMipa
-   LLVMTarget # Analysis, MC, Core, Support
-   LLVMAnalysis # Core, Support
-   LLVMOption # Support
diff -r 209ca2ac9cc3 -r 8c9751ac93a4 devel/include-what-you-use/patches/patch-iwyu__ast__util.cc
--- a/devel/include-what-you-use/patches/patch-iwyu__ast__util.cc       Tue Jul 26 12:46:38 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-$NetBSD: patch-iwyu__ast__util.cc,v 1.1 2016/03/14 14:36:39 tnn Exp $
-
-try to fix build w/ clang-3.8
-Not sure if this change is correct, but it seems to work
-
---- iwyu_ast_util.cc.orig      2015-12-11 05:45:54.000000000 +0000
-+++ iwyu_ast_util.cc
-@@ -105,6 +105,7 @@ using clang::TagDecl;
- using clang::TagType;
- using clang::TemplateArgument;
- using clang::TemplateArgumentList;
-+using clang::TemplateArgumentListInfo;
- using clang::TemplateArgumentLoc;
- using clang::TemplateDecl;
- using clang::TemplateName;
-@@ -759,7 +760,7 @@ map<const Type*, const Type*> GetTplType
-     num_args = call_expr->getNumArgs();
-     const Expr* callee_expr = call_expr->getCallee()->IgnoreParenCasts();
-     if (const ASTTemplateArgumentListInfo* explicit_tpl_args
--        = GetExplicitTplArgs(callee_expr)) {
-+        = GetExplicitTplArgs(decl, callee_expr)) {
-       retval = GetTplTypeResugarMapForFunctionExplicitTplArgs(
-           decl, explicit_tpl_args);
-       start_of_implicit_args = explicit_tpl_args->NumTemplateArgs;
-@@ -767,7 +768,7 @@ map<const Type*, const Type*> GetTplType
-   } else {
-     // If calling_expr has explicit template args, then consider them.
-     if (const ASTTemplateArgumentListInfo* explicit_tpl_args
--        = GetExplicitTplArgs(calling_expr)) {
-+        = GetExplicitTplArgs(decl, calling_expr)) {
-       retval = GetTplTypeResugarMapForFunctionExplicitTplArgs(
-           decl, explicit_tpl_args);
-       retval = ResugarTypeComponents(retval);
-@@ -1319,18 +1320,27 @@ bool IsCastToReferenceType(const CastExp
-   CHECK_UNREACHABLE_("Unexpected type of cast expression");
- }
- 
--const ASTTemplateArgumentListInfo* GetExplicitTplArgs(const Expr* expr) {
--  if (const DeclRefExpr* decl_ref = DynCastFrom(expr))
--    return decl_ref->getOptionalExplicitTemplateArgs();
--  if (const MemberExpr* member_expr = DynCastFrom(expr))
--    return member_expr->getOptionalExplicitTemplateArgs();
-+const ASTTemplateArgumentListInfo* GetExplicitTplArgs(const FunctionDecl* decl, const Expr* expr) {
-+  TemplateArgumentListInfo tali;
-+  if (const DeclRefExpr* decl_ref = DynCastFrom(expr)) {
-+    decl_ref->copyTemplateArgumentsInto(tali);
-+    return ASTTemplateArgumentListInfo::Create(decl->getASTContext(), tali);
-+  }
-+  if (const MemberExpr* member_expr = DynCastFrom(expr)) {
-+    member_expr->copyTemplateArgumentsInto(tali);
-+    return ASTTemplateArgumentListInfo::Create(decl->getASTContext(), tali);
-+  }
-   // Ugh, annoying casts needed because no const methods exist.
--  if (const OverloadExpr* overload_expr = DynCastFrom(expr))
--    return const_cast<OverloadExpr*>(overload_expr)
--        ->getOptionalExplicitTemplateArgs();
--  if (const DependentScopeDeclRefExpr* dependent_decl_ref = DynCastFrom(expr))
--    return const_cast<DependentScopeDeclRefExpr*>(dependent_decl_ref)
--        ->getOptionalExplicitTemplateArgs();
-+  if (const OverloadExpr* overload_expr = DynCastFrom(expr)) {
-+    const_cast<OverloadExpr*>(overload_expr)
-+        ->copyTemplateArgumentsInto(tali);
-+    return ASTTemplateArgumentListInfo::Create(decl->getASTContext(), tali);
-+  }
-+  if (const DependentScopeDeclRefExpr* dependent_decl_ref = DynCastFrom(expr)) {
-+    const_cast<DependentScopeDeclRefExpr*>(dependent_decl_ref)
-+        ->copyTemplateArgumentsInto(tali);
-+    return ASTTemplateArgumentListInfo::Create(decl->getASTContext(), tali);
-+  }
-   return NULL;
- }
- 
diff -r 209ca2ac9cc3 -r 8c9751ac93a4 devel/include-what-you-use/patches/patch-iwyu__ast__util.h
--- a/devel/include-what-you-use/patches/patch-iwyu__ast__util.h        Tue Jul 26 12:46:38 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-iwyu__ast__util.h,v 1.1 2016/03/14 14:36:39 tnn Exp $
-
-try to fix build w/ clang-3.8
-Not sure if this change is correct, but it seems to work
-
---- iwyu_ast_util.h.orig       2015-12-11 05:45:54.000000000 +0000
-+++ iwyu_ast_util.h
-@@ -800,6 +800,7 @@ bool IsCastToReferenceType(const clang::
- // Returns the list of explicit template args for all exprs that support
- // such a concept (declrefexpr, memberexpr), and NULL if none is present.
- const clang::ASTTemplateArgumentListInfo* GetExplicitTplArgs(
-+    const clang::FunctionDecl* decl,
-     const clang::Expr* expr);
- 
- }  // namespace include_what_you_use