From 717c08eff27d58a33820bad18c7e276bebf48537 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 9 Mar 2022 22:53:01 +0100 Subject: [PATCH] * Try to unbreak the build (issue #54242) MLIR undef issue --- debian/changelog | 8 ++++++++ debian/patches/issue-54242.diff | 13 +++++++++++++ debian/patches/series | 1 + 3 files changed, 22 insertions(+) create mode 100644 debian/patches/issue-54242.diff diff --git a/debian/changelog b/debian/changelog index ed04a572..784e19e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-snapshot (1:15~++20220309104405+e75f1d3c07ed-1~exp1) UNRELEASED; urgency=medium + + * Try to unbreak the build (issue #54242) + MLIR undef issue + + -- Sylvestre Ledru Wed, 09 Mar 2022 22:45:06 +0100 + llvm-toolchain-snapshot (1:15~++20220202093833+1a3137dc8451-1~exp2) unstable; urgency=medium * Install new llvm-remark-size-diff in llvm-X.Y @@ -69,6 +76,7 @@ llvm-toolchain-snapshot (1:14~++20220123085548+413684313d9d-1~exp1) experimental -- Sylvestre Ledru Sun, 23 Jan 2022 20:48:09 +0100 + llvm-toolchain-snapshot (1:14~++20220107114130+3a604fdbcd5f-1~exp1) experimental; urgency=medium * New snapshot release diff --git a/debian/patches/issue-54242.diff b/debian/patches/issue-54242.diff new file mode 100644 index 00000000..f0491904 --- /dev/null +++ b/debian/patches/issue-54242.diff @@ -0,0 +1,13 @@ +Index: llvm-toolchain-snapshot_15~++20220309104405+e75f1d3c07ed/mlir/lib/ExecutionEngine/CMakeLists.txt +=================================================================== +--- llvm-toolchain-snapshot_15~++20220309104405+e75f1d3c07ed.orig/mlir/lib/ExecutionEngine/CMakeLists.txt ++++ llvm-toolchain-snapshot_15~++20220309104405+e75f1d3c07ed/mlir/lib/ExecutionEngine/CMakeLists.txt +@@ -27,7 +27,7 @@ add_mlir_library(MLIRExecutionEngine + ExecutionEngine.cpp + OptUtils.cpp + +- EXCLUDE_FROM_LIBMLIR ++# EXCLUDE_FROM_LIBMLIR + + ADDITIONAL_HEADER_DIRS + ${MLIR_MAIN_INCLUDE_DIR}/mlir/ExecutionEngine diff --git a/debian/patches/series b/debian/patches/series index bb272902..17900cd0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -148,3 +148,4 @@ compilerrt-builtins-arch-fix-armhf.diff compilerrt-build-scudo-standalone-option.diff wasm-ld-path.diff python3-scan-build.py +issue-54242.diff