From ada0fc6bb3252a20da4bfd2e785243c2adc37eb5 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 12 Nov 2022 23:53:09 +0100 Subject: [PATCH 1/5] sccache: generate stats and publish them --- debian/rules | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 93d1f0c3..380b4df5 100755 --- a/debian/rules +++ b/debian/rules @@ -755,7 +755,8 @@ sccache-stats: # If we used sccache, shows stats if test -f /opt/sccache/sccache; then \ ls -al /opt/sccache/; \ - /opt/sccache/sccache --show-stats; \ + /opt/sccache/sccache --stats-format json --show-stats > /tmp/buildd/sccache-stats.json; \ + cat /tmp/buildd/sccache-stats.json; \ fi touch $@ @@ -1169,7 +1170,7 @@ override_dh_auto_test: endif -override_dh_gencontrol: +override_dh_gencontrol: sccache-stats dh_gencontrol -- $(control_vars) From 5e129ea18ecc8c000430491ba94325d84c7198d6 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 11 Nov 2022 19:36:17 +0100 Subject: [PATCH 2/5] pass sccache arg everywhere --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index 380b4df5..d11062c4 100755 --- a/debian/rules +++ b/debian/rules @@ -432,6 +432,7 @@ ifeq ($(shell test -e /tmp/cmake/bin/cmake && echo -n yes),yes) endif SCCACHE_ENABLE=no +SCCACHE_CMAKE = # if sccache is installed in the chroot, use it ifeq ($(shell test -e /opt/sccache/sccache && echo -n yes),yes) SCCACHE_CMAKE = -DCMAKE_C_COMPILER_LAUNCHER=/opt/sccache/sccache -DCMAKE_CXX_COMPILER_LAUNCHER=/opt/sccache/sccache From 19f47cc924022223bf4905aa37c49c3577765211 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 14 Nov 2022 11:15:50 +0100 Subject: [PATCH 3/5] Adjust to protobuf 3.21 (Closes: #1023533) --- debian/changelog | 1 + debian/patches/protobuf_3.21.patch | 14 ++++++++++++++ debian/patches/series | 1 + 3 files changed, 16 insertions(+) create mode 100644 debian/patches/protobuf_3.21.patch diff --git a/debian/changelog b/debian/changelog index 69e7b502..43eecfa5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-14 (1:14.0.6-8) unstable; urgency=medium * Fix the lldb swig issues (closes: #1023444) * Enable LLVM_USE_RELATIVE_PATHS_IN_DEBUG_INFO to help with caching + * Adjust to protobuf 3.21 (Closes: #1023533) -- Sylvestre Ledru Fri, 04 Nov 2022 19:36:56 +0100 diff --git a/debian/patches/protobuf_3.21.patch b/debian/patches/protobuf_3.21.patch new file mode 100644 index 00000000..da7d45da --- /dev/null +++ b/debian/patches/protobuf_3.21.patch @@ -0,0 +1,14 @@ +diff -Nur a/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp b/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp +--- a/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp 2022-01-23 01:26:53.000000000 +0100 ++++ b/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp 2022-09-08 19:17:39.103577486 +0200 +@@ -67,8 +67,8 @@ + google::protobuf::util::MessageToJsonString(Response, &Output, Options); + if (!JsonStatus.ok()) { + clang::clangd::elog("Can not convert response ({0}) to JSON ({1}): {2}\n", +- Response.DebugString(), JsonStatus.error_code(), +- JsonStatus.error_message().as_string()); ++ Response.DebugString(), (int)JsonStatus.code(), ++ JsonStatus.message().as_string()); + return -1; + } + llvm::outs() << Output; diff --git a/debian/patches/series b/debian/patches/series index 5852e004..b3563d78 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -159,3 +159,4 @@ ubuntu-kinetic.patch fix-typo-1018770.diff lldb/lldb-swig.diff lldb/lldb-swig-2.diff +protobuf_3.21.patch From e9f28b298ebad01020f5399f520a423fcf2033ea Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 15 Nov 2022 18:24:02 +0100 Subject: [PATCH 4/5] Disable the MLIR testsuite run because of a freeze (Closes: #1024154) See https://github.com/llvm/llvm-project/issues/58357 --- debian/changelog | 8 ++++++++ debian/rules | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index 43eecfa5..d5db5640 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +llvm-toolchain-14 (1:14.0.6-9) unstable; urgency=medium + + * Disable the MLIR testsuite run because of a freeze + (Closes: #1024154) + See https://github.com/llvm/llvm-project/issues/58357 + + -- Sylvestre Ledru Tue, 15 Nov 2022 18:23:44 +0100 + llvm-toolchain-14 (1:14.0.6-8) unstable; urgency=medium * Fix the lldb swig issues (closes: #1023444) diff --git a/debian/rules b/debian/rules index d11062c4..76d1c47d 100755 --- a/debian/rules +++ b/debian/rules @@ -1125,7 +1125,11 @@ endif ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-libcxxabi || true # MLIR +ifeq (,$(filter $(DEB_HOST_ARCH), i386 x32)) +# Do not run MLIR test on i386 because of +# https://github.com/llvm/llvm-project/issues/58357 ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-mlir || true +endif # Libclc ninja $(VERBOSE) -C libclc/build test || true From eb4bb9e7a474e13ffd7adf89bad00e12e5b8e20b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 13 Feb 2022 14:12:54 +0100 Subject: [PATCH 5/5] remove artifact --- debian/changelog | 7 ------- 1 file changed, 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index d5db5640..413272da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1856,13 +1856,6 @@ llvm-toolchain-snapshot (1:11~++20200621103028+10b0539772d-1~exp1) UNRELEASED; u * Upstream change ad97ccf6b26a29262c9cbf5b3e7f6e84c6dcf55f broke clangd-atomic-cmake.patch causing some undef symbol on i386 and atomic - * experimental New snapshot release - * experimental New snapshot release - * experimental New snapshot release - * experimental New snapshot release - * experimental New snapshot release - * experimental New snapshot release - * experimental New snapshot release -- Sylvestre Ledru Sun, 21 Jun 2020 10:33:23 +0200