proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-06-23 01:36:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '9' into snapshot

Browse Source
This commit is contained in:
Gianfranco Costamagna 2020-01-23 09:36:04 +01:00
commit c98f3add6e
5 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/changelog vendored
View File

@ -1,8 +1,15 @@
llvm-toolchain-snapshot (1:11~+20200119104557+84217ad6611-1~exp1) UNRELEASED; urgency=medium
[ Sylvestre Ledru ]
* experimental New snapshot release - 11
* Merge recent 9 changes (python 3 and testsuite mostly)
[ Gianfranco Costamagna ]
* fix lldb-10 -P path print (Closes: #945445)
* Fix lldb python installation path and symlinks
* Drop version constraint from libffi-dev library, satisfied since
old-old-stable
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 04 Jan 2020 10:56:15 +0100
llvm-toolchain-snapshot (1:10~++20191229111838+6991d5728f1-1~exp1) experimental; urgency=medium
@ -155,10 +162,11 @@ llvm-toolchain-snapshot (1:10~svn366440-1~exp1) experimental; urgency=medium
-- Sylvestre Ledru <sylvestre@debian.org> Thu, 18 Jul 2019 18:58:32 +0200
llvm-toolchain-9 (1:9.0.1-7) UNRELEASED; urgency=medium
llvm-toolchain-9 (1:9.0.1-7) unstable; urgency=medium
* Add dependency on libclang-cpp-9 from llvm-9-dev (Closes: #946761)
* fix lldb-9 -P path print (Closes: #945445)
* Fix lldb python installation path and symlinks
-- Gianfranco Costamagna <locutusofborg@debian.org> Tue, 21 Jan 2020 13:05:06 +0100

4
debian/control vendored
View File

@ -5,7 +5,7 @@ Rules-Requires-Root: no
Maintainer: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Uploaders: Sylvestre Ledru <sylvestre@debian.org>
Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils,
libffi-dev (>= 3.0.9),
libffi-dev,
lsb-release, patchutils, diffstat, xz-utils, python3-dev,
libedit-dev, libncurses5-dev, swig, python3-six, python3-sphinx (>= 1.3.6),
binutils-dev,
@ -323,7 +323,7 @@ Description: Modular compiler and toolchain technologies, IR interpreter
Package: llvm-10-dev
Architecture: any
Depends: ${shlibs:Depends}, libffi-dev (>= 3.0.10), ${misc:Depends},
Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends},
llvm-10 (= ${binary:Version}), libllvm10 (= ${binary:Version}), libtinfo-dev,
llvm-10-tools (= ${binary:Version}), libclang-cpp10 (= ${binary:Version}), libz3-dev
Description: Modular compiler and toolchain technologies, libraries and headers

26
debian/patches/print-lldb-path.patch vendored
View File

@ -1,18 +1,14 @@
Author: Gianfranco Costamagna <locutusofborg@debian.org>
Last-Update: 2020-01-21
Index: llvm-toolchain-9-9.0.1/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
===================================================================
--- llvm-toolchain-9-9.0.1.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
+++ llvm-toolchain-9-9.0.1/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
@@ -337,8 +337,8 @@
llvm::sys::path::append(path, style, LLDB_PYTHON_RELATIVE_LIBDIR);
#else
llvm::sys::path::append(path, style,
- "python" + llvm::Twine(PY_MAJOR_VERSION) + "." +
- llvm::Twine(PY_MINOR_VERSION),
+ "python" /*+ llvm::Twine(PY_MAJOR_VERSION)*/ + "3"
+ /*llvm::Twine(PY_MINOR_VERSION)*/,
"site-packages");
#endif
}
--- llvm-toolchain-snapshot-10~++20191229111838+6991d5728f1.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
+++ llvm-toolchain-snapshot-10~++20191229111838+6991d5728f1/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
@@ -353,6 +353,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);
+ // remove double "lib/lib" statement
+ std::replace(path.begin(), path.end(), '/lib/lib/', '/lib/');
#if defined(_WIN32)
// This will be injected directly through FileSpec.GetDirectory().SetString(),

4
debian/python3-lldb-X.Y.links.in vendored Normal file
View File

@ -0,0 +1,4 @@
usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/python3/dist-packages/lldb/libLLVM-@LLVM_VERSION_FULL@.so.1
usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/python3/dist-packages/lldb/libLLVM-@LLVM_VERSION@.so.1
usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/python3/dist-packages/lldb/_lldb.so
usr/lib/llvm-@LLVM_VERSION@/lib/python3/dist-packages/lldb/ usr/lib/python3/dist-packages/lldb

3
debian/rules vendored
View File

@ -597,7 +597,8 @@ endif
cp $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION_FULL)/README.txt $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION_FULL)/share/README.txt
# idem for the lldb python binding
mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python3/dist-packages/lldb/
mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python3/dist-packages/
mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python3.*/site-packages/* $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python3/dist-packages/
# Remove things that CMake install but which aren't packaged yet,
# or are packaged from the source or build tree.