rpms/gprconfig-kb
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make detection of Clang independent of locale.

Browse Source
This commit is contained in:
Dennis van Raaij 2024-01-14 18:45:47 +01:00 committed by Björn Persson
parent 5ae676f985
commit 277205c01f
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gprconfig-kb-improve-detection-of-clang.patch Normal file
View File

@ -0,0 +1,39 @@
--- a/db/compilers.xml
+++ b/db/compilers.xml
@@ -253,10 +253,8 @@
<name>C_LLVM</name>
<executable>clang</executable>
<version>
- <external>clang --version</external>
-
- <!-- '...clang version 6.0.0...' -->
- <grep regexp="clang version (\S+)" group="1"></grep>
+ <external>clang -dumpversion</external>
+ <grep regexp="[^\r\n]+"></grep>
</version>
<languages>C</languages>
<target>llvm</target>
@@ -267,10 +265,8 @@
<name>C++_LLVM</name>
<executable>clang\+\+</executable>
<version>
- <external>clang++ --version</external>
-
- <!-- '...clang version 6.0.0...' -->
- <grep regexp="clang version (\S+)" group="1"></grep>
+ <external>clang\+\+ -dumpversion</external>
+ <grep regexp="[^\r\n]+"></grep>
</version>
<languages>C++</languages>
<target>llvm</target>
@@ -483,8 +479,8 @@
<name>LLVM</name>
<executable>clang</executable>
<version>
- <external>clang -v</external>
- <grep regexp=".*(LLVM|clang) version ([0-9.]*)" group="2"></grep>
+ <external>clang -dumpversion</external>
+ <grep regexp="[^\r\n]+"></grep>
</version>
<languages>C,C++</languages>
<target>

3
gprconfig-kb.spec
View File

@ -24,6 +24,8 @@ Patch0: %{name}-fedora-compilers.patch
Patch1: %{name}-improve-detection-of-gcc.patch
# [Fedora specific] Make detection of GNU ld independent of locale.
Patch2: %{name}-improve-detection-of-gnu-ld.patch
# [Fedora specific] Make detection of Clang compilers independent of locale.
Patch3: %{name}-improve-detection-of-clang.patch
# The contents of this package are split off from the gprbuild package.
Conflicts: gprbuild <= 2020
@ -83,6 +85,7 @@ mkdir --parents %{buildroot}%{_datadir}/gprconfig
- Removed unused patch-file gprconfig-kb-detect-by-major-version.patch.
- Improve detection of GCC compilers; make it independent of locale.
- Improve detection of GNU ld; make it independent of locale.
- Improve detection of Clang compilers; make it independent of locale.
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 23.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild