clang-netbsd: fix patch

[Yang Zheng <tomsun.0.7%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Yang Zheng <tomsun.0.7%gmail.com@localhost>
Pushed By:	tomsun.0.7
Date:		Fri Apr 27 14:25:44 2018 +0000
Changeset:	34cbafb633747adf724870328d5d595539db10c6

Modified Files:
	clang-netbsd/distinfo
	clang-netbsd/patches/patch-lib_Basic_Targets_OSTargets.h
	clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.cpp
	clang-netbsd/patches/patch-test_Sema_128bitfloat.cpp
	clang-netbsd/patches/patch-tools_clang-format_CMakeLists.txt

Log Message:
clang-netbsd: fix patch

The parameter list of linkXRayRuntimeDeps has been changed from (ToolChain, Args, CmdArgs) to (ToolChain, CmdArgs).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=34cbafb633747adf724870328d5d595539db10c6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 clang-netbsd/distinfo                                        | 8 ++++----
 clang-netbsd/patches/patch-lib_Basic_Targets_OSTargets.h     | 4 ++--
 clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.cpp  | 4 ++--
 clang-netbsd/patches/patch-test_Sema_128bitfloat.cpp         | 2 +-
 clang-netbsd/patches/patch-tools_clang-format_CMakeLists.txt | 9 ++-------
 5 files changed, 11 insertions(+), 16 deletions(-)

diffs:
diff --git a/clang-netbsd/distinfo b/clang-netbsd/distinfo
index fb3388e3a5..30b0a22925 100644
--- a/clang-netbsd/distinfo
+++ b/clang-netbsd/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn Exp $
 
-SHA1 (patch-lib_Basic_Targets_OSTargets.h) = 9d229074c8e36be37176349971667817b227eaa5
-SHA1 (patch-lib_Driver_ToolChains_NetBSD.cpp) = 35117f4a3d6bb7b3bc46f06885e5a5f1d2ec5210
-SHA1 (patch-test_Sema_128bitfloat.cpp) = cc11582dd9495b603a22ef73609ab04f65324da2
-SHA1 (patch-tools_clang-format_CMakeLists.txt) = f119d2a94cbfb8c00a285d1aa7789ed26f8309cf
+SHA1 (patch-lib_Basic_Targets_OSTargets.h) = b6acc576a95305931338c54b18e02fe9813796cf
+SHA1 (patch-lib_Driver_ToolChains_NetBSD.cpp) = c4fda0795e16de454dff1aa07a834a0c9e1a5696
+SHA1 (patch-test_Sema_128bitfloat.cpp) = badf88253b37f921c588f568fb8841be8556c5f3
+SHA1 (patch-tools_clang-format_CMakeLists.txt) = 9ba2acd056dcac4b6cd72bc335f192134ecad125
diff --git a/clang-netbsd/patches/patch-lib_Basic_Targets_OSTargets.h b/clang-netbsd/patches/patch-lib_Basic_Targets_OSTargets.h
index 1df572ab81..6674a0dd77 100644
--- a/clang-netbsd/patches/patch-lib_Basic_Targets_OSTargets.h
+++ b/clang-netbsd/patches/patch-lib_Basic_Targets_OSTargets.h
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- lib/Basic/Targets/OSTargets.h.orig	2017-12-08 22:12:36.236521252 +0000
+--- lib/Basic/Targets/OSTargets.h.orig	2018-04-27 13:37:59.000000000 +0000
 +++ lib/Basic/Targets/OSTargets.h
-@@ -358,12 +358,23 @@ protected:
+@@ -364,12 +364,23 @@ protected:
      Builder.defineMacro("__ELF__");
      if (Opts.POSIXThreads)
        Builder.defineMacro("_REENTRANT");
diff --git a/clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.cpp b/clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.cpp
index 35f71664d2..c4b8ec723e 100644
--- a/clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.cpp
+++ b/clang-netbsd/patches/patch-lib_Driver_ToolChains_NetBSD.cpp
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/Driver/ToolChains/NetBSD.cpp.orig	2018-02-16 03:40:05.000000000 +0000
+--- lib/Driver/ToolChains/NetBSD.cpp.orig	2018-04-27 13:38:11.000000000 +0000
 +++ lib/Driver/ToolChains/NetBSD.cpp
 @@ -112,7 +112,9 @@ void netbsd::Linker::ConstructJob(Compil
                                    const InputInfoList &Inputs,
@@ -110,7 +110,7 @@ $NetBSD$
      if (NeedsSanitizerDeps)
        linkSanitizerRuntimeDeps(getToolChain(), CmdArgs);
 +    if (NeedsXRayDeps)
-+      linkXRayRuntimeDeps(ToolChain, Args, CmdArgs);
++      linkXRayRuntimeDeps(ToolChain, CmdArgs);
      if (Args.hasArg(options::OPT_pthread))
        CmdArgs.push_back("-lpthread");
      CmdArgs.push_back("-lc");
diff --git a/clang-netbsd/patches/patch-test_Sema_128bitfloat.cpp b/clang-netbsd/patches/patch-test_Sema_128bitfloat.cpp
index 4737025c85..f64a7d7ef6 100644
--- a/clang-netbsd/patches/patch-test_Sema_128bitfloat.cpp
+++ b/clang-netbsd/patches/patch-test_Sema_128bitfloat.cpp
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- test/Sema/128bitfloat.cpp.orig	2017-05-29 10:06:54.000000000 +0000
+--- test/Sema/128bitfloat.cpp.orig	2018-04-27 13:42:08.000000000 +0000
 +++ test/Sema/128bitfloat.cpp
 @@ -4,6 +4,8 @@
  // RUN: %clang_cc1 -triple i686-windows-gnu -verify -std=c++11 %s
diff --git a/clang-netbsd/patches/patch-tools_clang-format_CMakeLists.txt b/clang-netbsd/patches/patch-tools_clang-format_CMakeLists.txt
index 994196be43..e3948a6b78 100644
--- a/clang-netbsd/patches/patch-tools_clang-format_CMakeLists.txt
+++ b/clang-netbsd/patches/patch-tools_clang-format_CMakeLists.txt
@@ -1,13 +1,8 @@
 $NetBSD$
 
-git-clang-format is a git integration for clang-format,
-written in python. It could be moved to a separate package
-to avoid a python runtime dependency here, but for now I just opted
-to move it to share/clang and skip the interpreter check.
-
---- tools/clang-format/CMakeLists.txt.orig	2016-02-23 23:55:19.000000000 +0000
+--- tools/clang-format/CMakeLists.txt.orig	2018-04-27 13:37:40.000000000 +0000
 +++ tools/clang-format/CMakeLists.txt
-@@ -35,5 +35,5 @@ install(PROGRAMS clang-format.py
+@@ -36,5 +36,5 @@ install(PROGRAMS clang-format.py
    DESTINATION share/clang
    COMPONENT clang-format)
  install(PROGRAMS git-clang-format