[SRU] ccls: FTBFS with llvm-10
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
ccls (Ubuntu) |
Fix Released
|
Undecided
|
Unassigned | ||
Focal |
Fix Released
|
Undecided
|
Unassigned |
Bug Description
[Impact]
* the package in the archive currently FTBFS with llvm-default to 10
[Test Case]
* dpkg-buildpackage it
[Regression Potential]
* minimal, the new release is fixing only this problem, and comes from Debian maintainer
[Other info]
I find this package FTBFS in focal, because llvm-defaults is updated to 10.
https:/
The new version in Debian(sid) can fix this.
How does the SRU procedure work? Is this upstream microrelease suite for SRU?
The diff looks quite minimal.
```
diff -Nru ccls-0.
--- ccls-0.
+++ ccls-0.
@@ -1,3 +1,11 @@
+ccls (0.20190823.6-1) unstable; urgency=medium
+
+ * New upstream release 0.20190823.6
+ * Update Standards-Version to 4.5.0 (no changes)
+ * Run ccls index in autopkgtest
+
+ -- Shengjing Zhu <email address hidden> Wed, 22 Apr 2020 15:03:08 +0800
+
ccls (0.20190823.5-1) unstable; urgency=medium
* New upstream release 0.20190823.5
diff -Nru ccls-0.
--- ccls-0.
+++ ccls-0.
@@ -11,7 +11,7 @@
llvm-dev,
python3 <!nocheck>,
rapidjson-dev,
-Standards-Version: 4.4.1
+Standards-Version: 4.5.0
Homepage: https:/
Vcs-Browser: https:/
Vcs-Git: https:/
diff -Nru ccls-0.
--- ccls-0.
+++ ccls-0.
@@ -7,7 +7,7 @@
import subprocess
import time
-
+ccls = os.getenv("CCLS", "ccls")
path = os.path.
tests = [
@@ -118,17 +118,17 @@
return json.loads(
+subprocess.
+
with subprocess.Popen(
- [os.getenv("CCLS", "ccls"), "-v=-1"], stdin=subproces
+ [ccls, "-v=-1"], stdin=subproces
) as proc:
for tt in tests:
method = tt[0]["method"]
- if method == "initialize":
- # wait for ccls to finish indexing
- time.sleep(2)
+ time.sleep(1)
got = read(proc.stdout)
if not tt[1] == got:
diff -Nru ccls-0.
--- ccls-0.
+++ ccls-0.
@@ -8,6 +8,7 @@
#include <clang/AST/Type.h>
#include <clang/Lex/Lexer.h>
+#include <llvm/Support/
#include <llvm/Support/
using namespace clang;
diff -Nru ccls-0.
--- ccls-0.
+++ ccls-0.
@@ -31,7 +31,8 @@
for (sys::fs:
- std::string path = i->path(), filename = sys::path:
+ std::string path = i->path();
+ std::string filename(
if ((filename[0] == '.' && filename != ".ccls") ||
diff -Nru ccls-0.
--- ccls-0.
+++ ccls-0.
@@ -10,6 +10,7 @@
#include "sema_manager.hh"
#include <clang/AST/AST.h>
+#include <clang/
#include <clang/
#include <clang/
#include <clang/
@@ -508,7 +509,7 @@
llvm:
d->print(os, getDefaultPolic
- std::string name = os.str();
+ std::string name(str.data(), str.size());
simplifyAn
// Remove \n in DeclPrinter.cpp "{\n" + if(!TerseOutput
for (std::string:
@@ -677,10 +678,13 @@
public:
IndexDataCon
void initialize(
- bool handleDeclOccur
- ArrayRef<
- SourceLocation src_loc,
- ASTNodeInfo ast_node) override {
+#if LLVM_VERSION_MAJOR < 10 // llvmorg-
+# define handleDeclOccur
+#endif
+ bool handleDeclOccur
+ ArrayRef<
+ SourceLocation src_loc,
+ ASTNodeInfo ast_node) override {
if (!param.no_linkage) {
if (auto *nd = dyn_cast<
;
diff -Nru ccls-0.
--- ccls-0.
+++ ccls-0.
@@ -140,7 +140,7 @@
if (opt_index.size()) {
- pipeline:
+ pipeline:
} else {
// The thread that reads from stdin and dispatchs commands to the main
// thread.
diff -Nru ccls-0.
--- ccls-0.
+++ ccls-0.
@@ -113,7 +113,7 @@
}
// For inferred files, allow -o a a.cc -> -o b b.cc
- std::string stem = sys::path:
+ StringRef stem = sys::path:
int changed = -1, size = std::min(
for (int i = 0; i < size; i++)
if (strcmp(
diff -Nru ccls-0.
--- ccls-0.
+++ ccls-0.
@@ -1,14 +1,14 @@
-// Copyright 2017-2018 ccls Authors
+// Copyright 2017-2020 ccls Authors
// SPDX-License-
#pragma once
+#include <llvm/ADT/
+
#include <string>
-#include <string_view>
-#include <vector>
namespace ccls {
-std::string normalizePath(const std::string &path);
+std::string normalizePath(
// Free any unused memory and return it to the system.
void freeUnusedMemory();
diff -Nru ccls-0.
--- ccls-0.
+++ ccls-0.
@@ -40,7 +40,7 @@
void threadEnter();
}
-std::string normalizePath(const std::string &path) {
+std::string normalizePath(
llvm:
llvm:
return {p.data(), p.size()};
diff -Nru ccls-0.
--- ccls-0.
+++ ccls-0.
@@ -19,17 +19,12 @@
#include <thread>
namespace ccls {
-std::string normalizePath(const std::string &path) {
- DWORD retval = 0;
+std::string normalizePath(
TCHAR buffer[MAX_PATH] = TEXT("");
TCHAR **lpp_part = {NULL};
- std::string result;
- retval = GetFullPathName
- // fail, return original
- if (retval == 0)
- result = path;
- else
+ std::string result(path);
+ if (GetFullPathNam
result = buffer;
std:
diff -Nru ccls-0.
--- ccls-0.
+++ ccls-0.
@@ -222,7 +222,7 @@
return {};
std:
for (line_iterator i(*mbOrErr.get(), true, '#'), e; i != e; ++i) {
- std::string line = *i;
+ std::string line(*i);
doPathMapp
args.
}
@@ -632,7 +632,7 @@
void Project:
auto &gi = g_config->index;
GroupMatch match(gi.whitelist, gi.blacklist);
- std::string stem = sys::path:
+ StringRef stem = sys::path:
std:
for (const std::string &arg : g_config-
extra_
diff -Nru ccls-0.
--- ccls-0.
+++ ccls-0.
@@ -9,6 +9,7 @@
#include "pipeline.hh"
#include "platform.hh"
+#include <clang/
#include <clang/
#include <clang/
#include <clang/Sema/Sema.h>
@@ -622,9 +623,10 @@
for (const Note &n : d.notes) {
- Location loc{DocumentUri
- lsRange{
- {n.range.end.line, n.range.
+ Location loc{
+ DocumentUri:
+ lsRange{
+ {n.range.end.line, n.range.
}
} else {
diff -Nru ccls-0.
--- ccls-0.
+++ ccls-0.
@@ -1,4 +1,4 @@
-// Copyright 2017-2018 ccls Authors
+// Copyright 2017-2020 ccls Authors
// SPDX-License-
#include "serializer.hh"
@@ -13,6 +13,7 @@
#include <llvm/ADT/
#include <llvm/ADT/
+#include <llvm/Support/
#include <mutex>
#include <stdexcept>
@@ -216,7 +217,7 @@
reflectMembe
REFLECT_
if (gTestOutputMode) {
- std::string basename = llvm::sys:
+ std::string basename(
if (v.resolved_path[0] != '&')
basename = "&" + basename;
REFLECT_
```
Changed in ccls (Ubuntu): | |
status: | New → Fix Released |
Changed in ccls (Ubuntu Focal): | |
status: | New → In Progress |
summary: |
- FTBFS with llvm-10 + [SRU] ccls: FTBFS with llvm-10 |
description: | updated |
Hi Gianfranco,
I added you to the subscribers, since you maintains llvm in Ubuntu. I'm quite new to the Ubuntu procedure, could you help with this?