From e7d54dd00b8faa451998606cc53b3407e7d0ab5d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 3 Dec 2019 14:04:52 +0100 Subject: [PATCH] * Fix some paths, upstream moved from site-packages to dist-packages for python packages --- debian/changelog | 8 ++++++++ debian/python3-lldb-X.Y.install.in | 2 +- debian/rules | 14 +++++++------- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6231b656..ed97e7e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +llvm-toolchain-9 (1:9~+20191203075642+e99a087fff6-1~exp1) UNRELEASED; urgency=medium + + * experimental New snapshot release + * Fix some paths, upstream moved from site-packages + to dist-packages for python packages + + -- Sylvestre Ledru Tue, 03 Dec 2019 07:59:28 +0100 + llvm-toolchain-9 (1:9.0.1~+rc1-1~exp2) experimental; urgency=medium * Add a project in the cmake-test to silent a warning diff --git a/debian/python3-lldb-X.Y.install.in b/debian/python3-lldb-X.Y.install.in index bbf3d0b9..ef37de7e 100644 --- a/debian/python3-lldb-X.Y.install.in +++ b/debian/python3-lldb-X.Y.install.in @@ -1 +1 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/python3*/site-packages/lldb/ +usr/lib/llvm-@LLVM_VERSION@/lib/python3*/*-packages/lldb/ diff --git a/debian/rules b/debian/rules index 23e14afb..720fa540 100755 --- a/debian/rules +++ b/debian/rules @@ -588,7 +588,7 @@ 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/python2.7/site-packages/lldb/ + mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python2.7/dist-packages/lldb/ # Remove things that CMake install but which aren't packaged yet, # or are packaged from the source or build tree. @@ -598,7 +598,7 @@ endif # Don't think it is used rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libPolly*a # Probably useless - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/site-packages/six.py + rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/six.py rm -rf $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/build/utils/lit/lit/__pycache__/ \ $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/build/utils/lit/lit/*/__pycache__/ @@ -652,7 +652,7 @@ endif sed -i 's|.*_IMPORT_CHECK_FILES_FOR_.*/bin/.*)|#&|' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake # Managed in python-lldb-X.Y.links.in - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/site-packages/lldb/_lldb.so + rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/_lldb.so # Manage the polly files. Sometimes, we build them. Sometimes not. if test "$(POLLY_ENABLE)" = yes; then \ @@ -757,7 +757,7 @@ override_dh_installdeb: # Managed by the package dh_installdeb -a - rm -f $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/site-packages/lldb/__init__.pyc $(CURDIR)/debian/python-lldb-$(LLVM_VERSION)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/site-packages/lldb/__init__.pyc + rm -f $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/__init__.pyc $(CURDIR)/debian/python-lldb-$(LLVM_VERSION)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/__init__.pyc rm -f $(CURDIR)/debian/clang-$(LLVM_VERSION)-examples/usr/share/doc/clang-$(LLVM_VERSION)-examples/examples/*Make* # Remove auto generated python pyc @@ -801,7 +801,7 @@ endif ifeq (,$(filter $(DEB_HOST_ARCH), $(LLDB_DISABLE_ARCHS) armhf armel)) ifneq (,$(filter codecoverage,$(DEB_BUILD_OPTIONS))) # Create a symlink to run the testsuite: see https://bugs.archlinux.org/task/50759 - cd $(CURDIR)/$(TARGET_BUILD)/lib/python*/site-packages/; \ + cd $(CURDIR)/$(TARGET_BUILD)/lib/python*/*-packages/; \ if test ! -e _lldb.so; then \ ln -s lldb/_lldb.so; \ fi @@ -809,7 +809,7 @@ ifneq (,$(filter codecoverage,$(DEB_BUILD_OPTIONS))) LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/$(TARGET_BUILD)/lib/ $(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-lldb || true; \ fi # remove the workaround - rm $(CURDIR)/$(TARGET_BUILD)/lib/python*/site-packages/_lldb.so + rm $(CURDIR)/$(TARGET_BUILD)/lib/python*/*-packages/_lldb.so endif endif @@ -819,7 +819,7 @@ ifeq (${POLLY_ENABLE},yes) endif # Managed by debian build system - rm -f $(CURDIR)/$(TARGET_BUILD)/lib/python*/site-packages/lldb/_lldb.so + rm -f $(CURDIR)/$(TARGET_BUILD)/lib/python*/*-packages/lldb/_lldb.so # The compression of the code coverage report is done in the # hook B21GetCoverageResults on the server