* Replace LLDB_DISABLE_ARCHS macro with LLDB_ARCHS macro.

This commit is contained in:
Matthias Klose 2024-09-08 16:40:27 +02:00
parent edcf6ea341
commit cb93535be6
4 changed files with 9 additions and 14 deletions

1
debian/changelog vendored
View File

@ -7,6 +7,7 @@ llvm-toolchain-19 (1:19.1.0~++rc4-3) UNRELEASED; urgency=medium
* Limit lldb autopkg test to the lldb architectures.
* Generate debian/tests/* files.
* Disable the usage-wrapper/memory tracking by default.
* Replace LLDB_DISABLE_ARCHS macro with LLDB_ARCHS macro.
[ Aurelien Jarno ]
* Enable lldb on riscv64.

6
debian/control vendored
View File

@ -565,8 +565,7 @@ Description: LLVM-based linker, header files
# ------------- lldb -------------
Package: lldb-19
Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64
# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed
Architecture: amd64 arm64 armel armhf i386 loong64 m68k ppc64el riscv64 s390x x32
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version}),
python3-lldb-19
Pre-Depends: ${misc:Pre-Depends}
@ -577,8 +576,7 @@ Description: Next generation, high-performance debugger
Package: liblldb-19
Provides: ${t64:Provides}
Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64
# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed
Architecture: amd64 arm64 armel armhf i386 loong64 m68k ppc64el riscv64 s390x x32
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends}
Section: libs

6
debian/control.in vendored
View File

@ -565,8 +565,7 @@ Description: LLVM-based linker, header files
# ------------- lldb -------------
Package: lldb-@LLVM_VERSION@
Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64
# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed
Architecture: @LLDB_ARCHS@
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}),
python3-lldb-@LLVM_VERSION@
Pre-Depends: ${misc:Pre-Depends}
@ -577,8 +576,7 @@ Description: Next generation, high-performance debugger
Package: liblldb-@LLVM_VERSION@
Provides: ${t64:Provides}
Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64
# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed
Architecture: @LLDB_ARCHS@
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends}
Section: libs

10
debian/rules vendored
View File

@ -481,13 +481,10 @@ else
COVERITY_ENABLE=0
endif
LLDB_ENABLE=yes
LLDB_DISABLE_ARCHS := hurd-amd64 hurd-i386 ia64 powerpc powerpcspe ppc64 sparc64 mips64el mipsel
LLDB_ENABLE=no
# hurd has threading issues
ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH)))
# Disable LLDB for this arch.
LLDB_ENABLE=no
else
LLDB_ARCHS := amd64 arm64 armel armhf i386 loong64 m68k ppc64el riscv64 s390x x32
ifneq (,$(filter $(DEB_HOST_ARCH),$(LLDB_ARCHS)))
STAGE_ALL_CMAKE_EXTRA += -DLLDB_ENABLE_LUA=OFF
PROJECTS+=;lldb
endif
@ -688,6 +685,7 @@ stamps/preconfigure:
-e "s|@USAGE_BUILD_DEP@|$(USAGE_BUILD_DEP)|g" \
-e "s|@Z3_DEV_DEP@|$(Z3_DEV_DEP)|g" \
-e "s|@MULTILIB_ARCHS@|$(MULTILIB_ARCHS)|g" \
-e "s|@LLDB_ARCHS@|$(LLDB_ARCHS)|g" \
-e "s|@OCAML_ARCHS@|$(OCAML_ARCHS)|g" \
-e "s|@OMP_ARCHS@|$(OMP_ARCHS)|g" \
-e "s|@FLANG_ARCHS@|$(FLANG_ARCHS)|g" \