* New upstream release

* Remove the swig patches (applied upstream)
* Disable the MLIR testsuite run because of a freeze
  (Closes: #1024154)
  See https://github.com/llvm/llvm-project/issues/58357
* Adjust to protobuf 3.21 (Closes: #1023533)
This commit is contained in:
Sylvestre Ledru 2022-11-16 22:39:26 +01:00
commit b813bd5130
5 changed files with 36 additions and 49 deletions

23
debian/changelog vendored
View File

@ -48,6 +48,13 @@ llvm-toolchain-snapshot (1:16~++20220731055325+02b3a358926e-1~exp1) experimental
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 27 Jul 2022 21:36:27 +0200
llvm-toolchain-15 (1:15.0.5-1) unstable; urgency=medium
* New upstream release
* Remove the swig patches (applied upstream)
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 16 Nov 2022 09:11:01 +0100
llvm-toolchain-15 (1:15.0.4-1) unstable; urgency=medium
[ Jordan Justen ]
@ -285,10 +292,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
@ -2142,13 +2158,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

View File

@ -1,13 +0,0 @@
diff --git a/lldb/bindings/python/python-typemaps.swig b/lldb/bindings/python/python-typemaps.swig
index 203be803d2ebd..11f68d59ae7be 100644
--- a/lldb/bindings/python/python-typemaps.swig
+++ b/lldb/bindings/python/python-typemaps.swig
@@ -435,7 +435,7 @@ template <> bool SetNumberFromPyObject<double>(double &number, PyObject *obj) {
%typemap(out) lldb::FileSP {
$result = nullptr;
- lldb::FileSP &sp = $1;
+ const lldb::FileSP &sp = $1;
if (sp) {
PythonFile pyfile = unwrapOrSetPythonException(PythonFile::FromFile(*sp));
if (!pyfile.IsValid())

View File

@ -1,26 +0,0 @@
diff --git a/lldb/bindings/CMakeLists.txt b/lldb/bindings/CMakeLists.txt
index c8aa0bcf96817..9eed2f1e62999 100644
--- a/lldb/bindings/CMakeLists.txt
+++ b/lldb/bindings/CMakeLists.txt
@@ -26,8 +26,6 @@ set(SWIG_COMMON_FLAGS
-features autodoc
-I${LLDB_SOURCE_DIR}/include
-I${CMAKE_CURRENT_SOURCE_DIR}
- -D__STDC_LIMIT_MACROS
- -D__STDC_CONSTANT_MACROS
${DARWIN_EXTRAS}
)
diff --git a/lldb/bindings/interfaces.swig b/lldb/bindings/interfaces.swig
index fb75513a0df1b..d984711bbd8a2 100644
--- a/lldb/bindings/interfaces.swig
+++ b/lldb/bindings/interfaces.swig
@@ -1,8 +1,5 @@
/* Various liblldb typedefs that SWIG needs to know about. */
#define __extension__ /* Undefine GCC keyword to make Swig happy when processing glibc's stdint.h. */
-/* The ISO C99 standard specifies that in C++ implementations limit macros such
- as INT32_MAX should only be defined if __STDC_LIMIT_MACROS is. */
-#define __STDC_LIMIT_MACROS
%include "stdint.i"
%include "lldb/lldb-defines.h"

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;

9
debian/rules vendored
View File

@ -453,6 +453,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
@ -791,7 +792,9 @@ sccache-stats:
# If we used sccache, shows stats
if test -f /opt/sccache/sccache; then \
ls -al /opt/sccache/; \
/opt/sccache/sccache --show-stats; \
mkdir -p /tmp/buildd/source/; \
/opt/sccache/sccache --stats-format json --show-stats > /tmp/buildd/source/sccache-stats.json; \
cat /tmp/buildd/source/sccache-stats.json; \
fi
touch $@
@ -1175,7 +1178,7 @@ endif
ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-libcxxabi || true
# MLIR
ifeq (,$(filter $(DEB_HOST_ARCH), i386))
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
@ -1225,7 +1228,7 @@ override_dh_auto_test:
endif
override_dh_gencontrol:
override_dh_gencontrol: sccache-stats
dh_gencontrol -- $(control_vars)