From 12059d75d800f22b190c20e19f5c1ba8b1bedd78 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 23 Sep 2024 13:23:59 +0200 Subject: [PATCH] Don't enable intel-pt on Ubuntu Bionic --- debian/changelog | 8 ++------ debian/rules | 10 ++++++---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3d48c8bf..9fc10ca1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,11 @@ 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 Thanks to Santiago Vila for the patch (Closes: #1082359) ->>>>>>> + * Don't enable intel-pt on Ubuntu Bionic - -- Sylvestre Ledru Fri, 20 Sep 2024 13:22:50 +0200 + -- Sylvestre Ledru Mon, 23 Sep 2024 13:23:31 +0200 llvm-toolchain-18 (1:18.1.8-11) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index 934186ff..11033b0d 100755 --- a/debian/rules +++ b/debian/rules @@ -463,11 +463,13 @@ else PROJECTS+=;lldb endif -LLDB_PT_DISABLE_DISTRO := bionic + ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64)) -ifneq (,$(filter $(LLDB_PT_DISABLE_DISTRO),$(DISTRO))) - STAGE_ALL_CMAKE_EXTRA += -DLLDB_BUILD_INTEL_PT=ON -DLIBIPT_INCLUDE_PATH=/usr/include -DLIBIPT_LIBRARY_PATH=/usr/lib/$(DEB_HOST_MULTIARCH) -endif + INTEL_PT_DISABLE_DISTRO := bionic +# Disable intel-pt on old distro, fails on bionic (too old) + 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 LLDB_PYTHON_DISABLE_DISTRO := bionic buster