Don't enable intel-pt on Ubuntu Bionic

This commit is contained in:
Sylvestre Ledru 2024-09-23 13:23:59 +02:00
parent c85df2b2ae
commit 12059d75d8
2 changed files with 8 additions and 10 deletions

8
debian/changelog vendored
View File

@ -1,15 +1,11 @@
llvm-toolchain-18 (1:18.1.8-12) UNRELEASED; urgency=medium llvm-toolchain-18 (1:18.1.8-12) UNRELEASED; urgency=medium
<<<<<<<
* Ensure that at least 1 CPU is used for build
(Closes: #1082359)
=======
* Ensure that at least 1 CPU is used for build * Ensure that at least 1 CPU is used for build
Thanks to Santiago Vila for the patch Thanks to Santiago Vila for the patch
(Closes: #1082359) (Closes: #1082359)
>>>>>>> * Don't enable intel-pt on Ubuntu Bionic
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 20 Sep 2024 13:22:50 +0200 -- Sylvestre Ledru <sylvestre@debian.org> Mon, 23 Sep 2024 13:23:31 +0200
llvm-toolchain-18 (1:18.1.8-11) unstable; urgency=medium llvm-toolchain-18 (1:18.1.8-11) unstable; urgency=medium

10
debian/rules vendored
View File

@ -463,11 +463,13 @@ else
PROJECTS+=;lldb PROJECTS+=;lldb
endif endif
LLDB_PT_DISABLE_DISTRO := bionic
ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64)) ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64))
ifneq (,$(filter $(LLDB_PT_DISABLE_DISTRO),$(DISTRO))) INTEL_PT_DISABLE_DISTRO := bionic
STAGE_ALL_CMAKE_EXTRA += -DLLDB_BUILD_INTEL_PT=ON -DLIBIPT_INCLUDE_PATH=/usr/include -DLIBIPT_LIBRARY_PATH=/usr/lib/$(DEB_HOST_MULTIARCH) # Disable intel-pt on old distro, fails on bionic (too old)
endif ifeq (,$(filter $(DISTRO), $(INTEL_PT_DISABLE_DISTRO)))
STAGE_ALL_CMAKE_EXTRA += -DLLDB_BUILD_INTEL_PT=ON -DLIBIPT_INCLUDE_PATH=/usr/include -DLIBIPT_LIBRARY_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)
endif
endif endif
LLDB_PYTHON_DISABLE_DISTRO := bionic buster LLDB_PYTHON_DISABLE_DISTRO := bionic buster