proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-08-03 14:42:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/14' into 15

Browse Source
This commit is contained in:
Sylvestre Ledru 2022-11-16 09:08:58 +01:00
commit 8ee2b70653
4 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
debian/changelog vendored
View File

@ -235,10 +235,19 @@ llvm-toolchain-snapshot (1:15~++20220202093833+1a3137dc8451-1~exp1) experimental
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 13 Feb 2022 23:25:57 +0100
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 <sylvestre@debian.org> 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)
* Enable LLVM_USE_RELATIVE_PATHS_IN_DEBUG_INFO to help with caching
* Adjust to protobuf 3.21 (Closes: #1023533)
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 04 Nov 2022 19:36:56 +0100
@ -2092,13 +2101,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 <sylvestre@debian.org> Sun, 21 Jun 2020 10:33:23 +0200

14
debian/patches/protobuf_3.21.patch vendored Normal file
View File

@ -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;

1
debian/patches/series vendored
View File

@ -154,3 +154,4 @@ D124841-fix-powerpc-miscompile.patch
mips/mips-assert-size.diff
lldb/lldb-swig.diff
lldb/lldb-swig-2.diff
protobuf_3.21.patch

10
debian/rules vendored
View File

@ -446,6 +446,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
@ -783,7 +784,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 $@
@ -1167,7 +1169,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
@ -1213,7 +1219,7 @@ override_dh_auto_test:
endif
override_dh_gencontrol:
override_dh_gencontrol: sccache-stats
dh_gencontrol -- $(control_vars)