diff --git a/debian/changelog b/debian/changelog index c327a957..2c1cd1de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -121,6 +121,13 @@ llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental -- Sylvestre Ledru Sat, 28 Jan 2023 18:07:40 +0100 +llvm-toolchain-16 (1:16.0.6-15) unstable; urgency=medium + + * Second attempt to refresh D158066.patch (Closes: #1049362) + * Second attempt to fix mips64el without loosing ompd + + -- Gianfranco Costamagna Mon, 11 Sep 2023 15:40:42 +0200 + llvm-toolchain-16 (1:16.0.6-14) unstable; urgency=medium [ Sylvestre Ledru ] diff --git a/debian/patches/mips64el-ompt.patch b/debian/patches/mips64el-ompt.patch new file mode 100644 index 00000000..3e84a148 --- /dev/null +++ b/debian/patches/mips64el-ompt.patch @@ -0,0 +1,10 @@ +--- llvm-toolchain-16-16.0.6.orig/openmp/runtime/cmake/config-ix.cmake ++++ llvm-toolchain-16-16.0.6/openmp/runtime/cmake/config-ix.cmake +@@ -328,6 +329,7 @@ else() + (LIBOMP_ARCH STREQUAL aarch64) OR + (LIBOMP_ARCH STREQUAL aarch64_a64fx) OR + (LIBOMP_ARCH STREQUAL ppc64le) OR ++ (LIBOMP_ARCH STREQUAL mips64) OR + (LIBOMP_ARCH STREQUAL ppc64) OR + (LIBOMP_ARCH STREQUAL riscv64) OR + (LIBOMP_ARCH STREQUAL loongarch64)) diff --git a/debian/patches/series b/debian/patches/series index 6a2193ac..edd8aa9e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -148,3 +148,4 @@ force-sse2-compiler-rt.diff bolt-disable-emit-relocs.patch link-grpc.diff D158066.patch +mips64el-ompt.patch diff --git a/debian/rules b/debian/rules index a44eeee6..9a215574 100755 --- a/debian/rules +++ b/debian/rules @@ -1217,7 +1217,7 @@ endif # Disable the python binding for buster. not sure why it regressed # regressed de4364f1ecaa..0745b0c0354a - if test "$(DISTRO)" = "buster" -o "$(DISTRO)" = "bionic" -o "$(DEB_HOST_ARCH)" = "mips64el"; then \ + if test "$(DISTRO)" = "buster" -o "$(DISTRO)" = "bionic"; then \ mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/; \ touch $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/empty; \ echo "" > debian/python3-lldb-$(LLVM_VERSION).install; \