From 6be367e58fdc055072653186473c64b2ec091d03 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Fri, 18 Aug 2023 08:38:37 +0200 Subject: [PATCH] Disable unwind on mips64el, fixing FTBFS --- debian/control | 6 +++--- debian/control.in | 6 +++--- debian/rules | 9 ++++++++- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/debian/control b/debian/control index 9664cd9b..13fa753d 100644 --- a/debian/control +++ b/debian/control @@ -689,7 +689,7 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: libc++1-16 (= ${binary:Version}), ${misc:Depends}, - libunwind-16-dev [amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64] + libunwind-16-dev [amd64 arm64 armhf i386 ppc64el ppc64 riscv64] Breaks: libc++-dev (<< 44) Provides: libc++-x.y-dev Conflicts: libc++-x.y-dev @@ -829,7 +829,7 @@ Description: OpenCL C language implementation - development files Package: libunwind-16 Section: libs -Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 +Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64 Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} @@ -846,7 +846,7 @@ Description: production-quality unwinder Package: libunwind-16-dev Section: libdevel -Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 +Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64 Multi-Arch: same Depends: ${misc:Depends}, diff --git a/debian/control.in b/debian/control.in index 5b0eaf10..8b55e308 100644 --- a/debian/control.in +++ b/debian/control.in @@ -689,7 +689,7 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: libc++1-@LLVM_VERSION@ (= ${binary:Version}), ${misc:Depends}, - libunwind-@LLVM_VERSION@-dev [amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64] + libunwind-@LLVM_VERSION@-dev [amd64 arm64 armhf i386 ppc64el ppc64 riscv64] Breaks: libc++-dev (<< 44) Provides: libc++-x.y-dev Conflicts: libc++-x.y-dev @@ -829,7 +829,7 @@ Description: OpenCL C language implementation - development files Package: libunwind-@LLVM_VERSION@ Section: libs -Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 +Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64 Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} @@ -846,7 +846,7 @@ Description: production-quality unwinder Package: libunwind-@LLVM_VERSION@-dev Section: libdevel -Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 +Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64 Multi-Arch: same Depends: ${misc:Depends}, diff --git a/debian/rules b/debian/rules index 2a1c3766..f1123ee0 100755 --- a/debian/rules +++ b/debian/rules @@ -221,6 +221,13 @@ ifneq (,$(filter $(DEB_HOST_ARCH),s390x)) LIBCXX_USE_COMPILER_RT := OFF endif +ifneq (,$(filter $(DEB_HOST_ARCH),mips64el)) + STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON + STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_BUILD_BUILTINS=OFF + COMPILER_RT_USE_BUILTINS_LIBRARY := OFF + LIBCXX_USE_COMPILER_RT := OFF +endif + ifneq (,$(filter $(DEB_HOST_ARCH),x32)) STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=x86_64-linux-gnux32 STAGE_ALL_CMAKE_EXTRA += -DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-linux-gnux32 @@ -306,7 +313,7 @@ endif # Enable libunwind (or not) LIBUNWIND_ENABLE=yes -ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel m68k mipsel hurd-i386 powerpc sparc sparc64 x32)) +ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel m68k mipsel mips64el hurd-i386 powerpc sparc sparc64 x32)) LIBUNWIND_ENABLE=no # do not use compiler-rt builtins for libcxx (libcxxabi) when libunwind is # disabled since the gnu implementation in libgcc_s will then be required