Details
-
Bug
-
Resolution: Done
-
P3: Somewhat important
-
5.12.5, 5.12.6, 5.13.0, 5.13.1, 5.13.2, 5.14.0
-
None
-
LLVM 10.0.0git built from official repository, installed into isolated environment
-
-
1
-
447f33743c3e07d645831f07b821ad76a203fd6f (qt/qttools/5.14)
-
DaVinci sprint 1, DaVinci sprint 2
Description
If the system has LLVM installation built from source taken with Git, the "git" suffix is added to the version string:
llvm-config --version 10.0.0git
The issue with file qttools/src/qdoc/configure.pri leads to the build system is unable to find libclang because it assumes only "svn" suffix. So it is needed to patch the file before configuration to correctly compile QDoc. To avoid the issue the following strings should be changed:
defineReplace(extractVersion) { return($$replace(1, ^(\\d+\\.\\d+\\.\\d+)(svn)?$, \\1)) } defineReplace(extractMajorVersion) { return($$replace(1, ^(\\d+)\\.\\d+\\.\\d+(svn)?$, \\1)) } defineReplace(extractMinorVersion) { return($$replace(1, ^\\d+\\.(\\d+)\\.\\d+(svn)?$, \\1)) } defineReplace(extractPatchVersion) { return($$replace(1, ^\\d+\\.\\d+\\.(\\d+)(svn)?$, \\1)) }
to
defineReplace(extractVersion) { return($$replace(1, ^(\\d+\\.\\d+\\.\\d+)(svn|git)?$, \\1)) } defineReplace(extractMajorVersion) { return($$replace(1, ^(\\d+)\\.\\d+\\.\\d+(svn|git)?$, \\1)) } defineReplace(extractMinorVersion) { return($$replace(1, ^\\d+\\.(\\d+)\\.\\d+(svn|git)?$, \\1)) } defineReplace(extractPatchVersion) { return($$replace(1, ^\\d+\\.\\d+\\.(\\d+)(svn|git)?$, \\1)) }
Attachments
For Gerrit Dashboard: QTBUG-81534 | ||||||
---|---|---|---|---|---|---|
# | Subject | Branch | Project | Status | CR | V |
287282,2 | QDoc: Let configure accept libclang built from git sources | 5.14 | qt/qttools | Status: MERGED | +2 | 0 |