Merge tag 'debian/11.0.0-5' into proxmox/buster

[llvm-toolchain.git] / debian / patches / 19-clang_debian_version.patch

diff --git a/debian/patches/19-clang_debian_version.patch b/debian/patches/19-clang_debian_version.patch
index ba7f098b149d48b0d60204bd46964371b2a20766..0bb32879fa36852f48a9d471bce506556aed0624 100644 (file)
--- a/debian/patches/19-clang_debian_version.patch
+++ b/debian/patches/19-clang_debian_version.patch
@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_10~+201911111222550800646d927175e/clang/lib/Basic/Version.cpp
+Index: llvm-toolchain-snapshot_11~++20200708031542+64363a9d930/clang/lib/Basic/Version.cpp
 ===================================================================
---- llvm-toolchain-snapshot_10~+201911111222550800646d927175e.orig/clang/lib/Basic/Version.cpp
-+++ llvm-toolchain-snapshot_10~+201911111222550800646d927175e/clang/lib/Basic/Version.cpp
+--- llvm-toolchain-snapshot_11~++20200708031542+64363a9d930.orig/clang/lib/Basic/Version.cpp
++++ llvm-toolchain-snapshot_11~++20200708031542+64363a9d930/clang/lib/Basic/Version.cpp
 @@ -14,6 +14,7 @@
  #include "clang/Basic/LLVM.h"
  #include "clang/Config/config.h"
@@ -10,12 +10,12 @@ Index: llvm-toolchain-snapshot_10~+201911111222550800646d927175e/clang/lib/Basic
  #include <cstdlib>
  #include <cstring>
  
-@@ -124,7 +125,7 @@ std::string getClangToolFullVersion(Stri
+@@ -97,7 +98,7 @@ std::string getClangToolFullVersion(Stri
  #ifdef CLANG_VENDOR
    OS << CLANG_VENDOR;
  #endif
--  OS << ToolName << " version " CLANG_VERSION_STRING " "
-+  OS << ToolName << " version " CLANG_VERSION_STRING "-" DEB_PATCHSETVERSION " "
-      << getClangFullRepositoryVersion();
+-  OS << ToolName << " version " CLANG_VERSION_STRING;
++  OS << ToolName << " version " CLANG_VERSION_STRING "-" DEB_PATCHSETVERSION;
  
-   return OS.str();
+   std::string repo = getClangFullRepositoryVersion();
+   if (!repo.empty()) {