rebase of the patch

This commit is contained in:
Sylvestre Ledru 2020-07-08 16:03:55 +02:00
parent 31a1a28a1a
commit ceeeb70e79
2 changed files with 10 additions and 10 deletions

View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/lib/Basic/Version.cpp
Index: llvm-toolchain-snapshot_11~++20200708031542+64363a9d930/clang/lib/Basic/Version.cpp
===================================================================
--- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/clang/lib/Basic/Version.cpp
+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/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"
@ -14,8 +14,8 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/lib/Basic/V
#ifdef CLANG_VENDOR
OS << CLANG_VENDOR;
#endif
- OS << ToolName << " version " CLANG_VERSION_STRING " "
- OS << ToolName << " version " CLANG_VERSION_STRING;
+ OS << ToolName << " version " CLANG_VERSION_STRING "-" DEB_PATCHSETVERSION " "
<< getClangFullRepositoryVersion();
return OS.str();
std::string repo = getClangFullRepositoryVersion();
if (!repo.empty()) {

View File

@ -1,11 +1,11 @@
Author: Gianfranco Costamagna <locutusofborg@debian.org>
Last-Update: 2020-01-21
Index: llvm-toolchain-snapshot_11~++20200409051253+d08105482e1/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
Index: llvm-toolchain-snapshot_11~++20200708031542+64363a9d930/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
===================================================================
--- llvm-toolchain-snapshot_11~++20200409051253+d08105482e1.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
+++ llvm-toolchain-snapshot_11~++20200409051253+d08105482e1/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
@@ -371,6 +371,8 @@ void ScriptInterpreterPython::ComputePyt
--- llvm-toolchain-snapshot_11~++20200708031542+64363a9d930.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
+++ llvm-toolchain-snapshot_11~++20200708031542+64363a9d930/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
@@ -365,6 +365,8 @@ void ScriptInterpreterPython::ComputePyt
// x86_64, or bin on Windows).
llvm::sys::path::remove_filename(path);
llvm::sys::path::append(path, LLDB_PYTHON_RELATIVE_LIBDIR);