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

* Fix python-lldb dependencies and make proper symlinks to libLLVM

Browse Source 
and liblldb as suggested by Graham Inggs (Closes: #821022).
* Fix liblldb suffix in lldb/scripts/Python/finishSwigPythonLLDB.py
  (Closes: #813798).
This commit is contained in:
Pablo Oliveira 2016-05-09 15:04:00 +00:00
parent bd33ffeced
commit 65c51c9a32
7 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -8,6 +8,12 @@ llvm-toolchain-3.8 (1:3.8.1-2) unstable; urgency=medium
cover the CMake build system too cover the CMake build system too
(Closes: #819072) (Closes: #819072)
[ Pablo Oliveira ]
* Fix python-lldb dependencies and make proper symlinks to libLLVM
and liblldb as suggested by Graham Inggs (Closes: #821022)
* Fix liblldb suffix in lldb/scripts/Python/finishSwigPythonLLDB.py
(Closes: #813798)
-- --
llvm-toolchain-3.8 (1:3.8.1-1) UNRELEASED; urgency=medium llvm-toolchain-3.8 (1:3.8.1-1) UNRELEASED; urgency=medium

2
debian/control vendored
View File

@ -395,7 +395,7 @@ Description: Next generation, high-performance debugger, debugging libraries
Package: python-lldb-3.8 Package: python-lldb-3.8
Section: python Section: python
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-3.8, lldb-3.8, python
Conflicts: python-lldb-3.4, python-lldb-3.5, python-lldb-3.6, python-lldb-3.7 Conflicts: python-lldb-3.4, python-lldb-3.5, python-lldb-3.6, python-lldb-3.7
Pre-Depends: ${misc:Pre-Depends} Pre-Depends: ${misc:Pre-Depends}
Description: Next generation, high-performance debugger, python lib Description: Next generation, high-performance debugger, python lib

1
debian/liblldb-X.Y.links.in vendored
View File

@ -1,4 +1,3 @@
usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so
usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so usr/lib/python2.7/dist-packages/lldb-@LLVM_VERSION@/_lldb.so
usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1 usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1

13
debian/patches/lldb-soname.diff vendored
View File

@ -54,3 +54,16 @@
endif() endif()
if (LLDB_WRAP_PYTHON) if (LLDB_WRAP_PYTHON)
--- a/lldb/scripts/Python/finishSwigPythonLLDB.py
+++ b/lldb/scripts/Python/finishSwigPythonLLDB.py
@@ -378,7 +378,7 @@
if eOSType == utilsOsType.EnumOsType.Darwin:
strLibFileExtn = ".dylib"
else:
- strLibFileExtn = "so"
+ strLibFileExtn = "-3.8.so.1"
strSrc = os.path.join("lib", "liblldb" + strLibFileExtn)
bOk, strErrMsg = make_symlink(vDictArgs, vstrFrameworkPythonDir, strSrc, strTarget)

2
debian/prepare-new-release.sh vendored
View File

@ -9,7 +9,7 @@ for F in $LIST; do
TARGET=`echo $F|sed -e "s|$ORIG_VERSION|$TARGET_VERSION|g"` TARGET=`echo $F|sed -e "s|$ORIG_VERSION|$TARGET_VERSION|g"`
svn mv $F $TARGET svn mv $F $TARGET
done done
LIST=`ls debian/*$TARGET_VERSION* debian/control debian/*.install debian/*.links debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff` LIST=`ls debian/*$TARGET_VERSION* debian/control debian/*.install debian/*.links debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/lldb-soname.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff`
for F in $LIST; do for F in $LIST; do
sed -i -e "s|$ORIG_VERSION_2|$TARGET_VERSION_2|g" $F sed -i -e "s|$ORIG_VERSION_2|$TARGET_VERSION_2|g" $F
sed -i -e "s|$ORIG_VERSION|$TARGET_VERSION|g" $F sed -i -e "s|$ORIG_VERSION|$TARGET_VERSION|g" $F

5
debian/python-lldb-X.Y.links.in vendored
View File

@ -1,5 +1,6 @@
usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 usr/lib/python2.7/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/python2.7/site-packages/lldb/libLLVM-@LLVM_VERSION_FULL@.so.1
usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 usr/lib/python2.7/dist-packages/lldb/libLLVM-@LLVM_VERSION@.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/python2.7/site-packages/lldb/libLLVM-@LLVM_VERSION@.so.1
usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/python2.7/site-packages/lldb/_lldb.so
usr/lib/llvm-@LLVM_VERSION@/lib/python2.7/site-packages/lldb/ usr/lib/python2.7/dist-packages/lldb usr/lib/llvm-@LLVM_VERSION@/lib/python2.7/site-packages/lldb/ usr/lib/python2.7/dist-packages/lldb

4
debian/rules vendored
View File

@ -411,8 +411,8 @@ endif
# Change CMake module dir # Change CMake module dir
sed -i 's|LLVM_CMAKE_DIR "/usr/lib/llvm-$(LLVM_VERSION)/share/llvm/cmake"|LLVM_CMAKE_DIR "/usr/share/llvm-$(LLVM_VERSION)/cmake"|' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/llvm/cmake/LLVMConfig.cmake sed -i 's|LLVM_CMAKE_DIR "/usr/lib/llvm-$(LLVM_VERSION)/share/llvm/cmake"|LLVM_CMAKE_DIR "/usr/share/llvm-$(LLVM_VERSION)/cmake"|' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/llvm/cmake/LLVMConfig.cmake
# Managed in lldb-X.Y.links.in # Managed in python-lldb-X.Y.links.in
rm -f $(CURDIR)/$(TARGET_BUILD)/$(BUILD_DIR)/lib/python*/site-packages/lldb/_lldb.so rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/site-packages/lldb/_lldb.so
# Manage the polly files. Sometimes, we build them. Sometimes not. # Manage the polly files. Sometimes, we build them. Sometimes not.
if test "$(POLLY_ENABLE)" = yes; then \ if test "$(POLLY_ENABLE)" = yes; then \