mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-10-25 23:12:51 +00:00
rebase of the patch
This commit is contained in:
parent
31a1a28a1a
commit
ceeeb70e79
12
debian/patches/19-clang_debian_version.patch
vendored
12
debian/patches/19-clang_debian_version.patch
vendored
@ -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~++20200708031542+64363a9d930.orig/clang/lib/Basic/Version.cpp
|
||||||
+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/lib/Basic/Version.cpp
|
+++ llvm-toolchain-snapshot_11~++20200708031542+64363a9d930/clang/lib/Basic/Version.cpp
|
||||||
@@ -14,6 +14,7 @@
|
@@ -14,6 +14,7 @@
|
||||||
#include "clang/Basic/LLVM.h"
|
#include "clang/Basic/LLVM.h"
|
||||||
#include "clang/Config/config.h"
|
#include "clang/Config/config.h"
|
||||||
@ -14,8 +14,8 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/clang/lib/Basic/V
|
|||||||
#ifdef CLANG_VENDOR
|
#ifdef CLANG_VENDOR
|
||||||
OS << CLANG_VENDOR;
|
OS << CLANG_VENDOR;
|
||||||
#endif
|
#endif
|
||||||
- OS << ToolName << " version " CLANG_VERSION_STRING " "
|
- OS << ToolName << " version " CLANG_VERSION_STRING;
|
||||||
+ OS << ToolName << " version " CLANG_VERSION_STRING "-" DEB_PATCHSETVERSION " "
|
+ OS << ToolName << " version " CLANG_VERSION_STRING "-" DEB_PATCHSETVERSION " "
|
||||||
<< getClangFullRepositoryVersion();
|
|
||||||
|
|
||||||
return OS.str();
|
std::string repo = getClangFullRepositoryVersion();
|
||||||
|
if (!repo.empty()) {
|
||||||
|
|||||||
8
debian/patches/print-lldb-path.patch
vendored
8
debian/patches/print-lldb-path.patch
vendored
@ -1,11 +1,11 @@
|
|||||||
Author: Gianfranco Costamagna <locutusofborg@debian.org>
|
Author: Gianfranco Costamagna <locutusofborg@debian.org>
|
||||||
Last-Update: 2020-01-21
|
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~++20200708031542+64363a9d930.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
|
||||||
+++ llvm-toolchain-snapshot_11~++20200409051253+d08105482e1/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
|
+++ llvm-toolchain-snapshot_11~++20200708031542+64363a9d930/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
|
||||||
@@ -371,6 +371,8 @@ void ScriptInterpreterPython::ComputePyt
|
@@ -365,6 +365,8 @@ void ScriptInterpreterPython::ComputePyt
|
||||||
// x86_64, or bin on Windows).
|
// x86_64, or bin on Windows).
|
||||||
llvm::sys::path::remove_filename(path);
|
llvm::sys::path::remove_filename(path);
|
||||||
llvm::sys::path::append(path, LLDB_PYTHON_RELATIVE_LIBDIR);
|
llvm::sys::path::append(path, LLDB_PYTHON_RELATIVE_LIBDIR);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user