Add symlink to clang-format-diff in /usr/bin

rhbz#1939018
This commit is contained in:
Tom Stellard 2021-04-14 02:45:51 +00:00
parent efa487912b
commit 73f8cd5920
3 changed files with 20 additions and 1 deletions

View File

@ -4,7 +4,7 @@
%global min_ver 0 %global min_ver 0
%global patch_ver 0 %global patch_ver 0
#%%global rc_ver 1 #%%global rc_ver 1
%global baserelease 2 %global baserelease 3
%global clang_tools_binaries \ %global clang_tools_binaries \
%{_bindir}/clang-apply-replacements \ %{_bindir}/clang-apply-replacements \
@ -424,6 +424,9 @@ popd
# Remove clang-tidy headers. We don't ship the libraries for these. # Remove clang-tidy headers. We don't ship the libraries for these.
rm -Rvf %{buildroot}%{_includedir}/clang-tidy/ rm -Rvf %{buildroot}%{_includedir}/clang-tidy/
# Add a symlink in /usr/bin to clang-format-diff
ln -s %{_datadir}/clang/clang-format-diff.py %{buildroot}%{_bindir}/clang-format-diff
%check %check
%if !0%{?compat_build} %if !0%{?compat_build}
# requires lit.py from LLVM utilities # requires lit.py from LLVM utilities
@ -485,6 +488,7 @@ false
%{_bindir}/c-index-test %{_bindir}/c-index-test
%{_bindir}/find-all-symbols %{_bindir}/find-all-symbols
%{_bindir}/modularize %{_bindir}/modularize
%{_bindir}/clang-format-diff
%{_mandir}/man1/diagtool.1.gz %{_mandir}/man1/diagtool.1.gz
%{_emacs_sitestartdir}/clang-format.el %{_emacs_sitestartdir}/clang-format.el
%{_emacs_sitestartdir}/clang-rename.el %{_emacs_sitestartdir}/clang-rename.el
@ -506,6 +510,10 @@ false
%endif %endif
%changelog %changelog
* Wed Apr 14 2021 Tom Stellard <tstellar@redhat.com> - 11.0.0-3
- Add symlink to clang-format-diff in /usr/bin
- rhbz#1939018
* Thu Oct 29 2020 sguelton@redhat.com - 11.0.0-2 * Thu Oct 29 2020 sguelton@redhat.com - 11.0.0-2
- Prevent ABI conflict with release candidate - Prevent ABI conflict with release candidate
- Prefer gcc toolchains with libgcc_s - Prefer gcc toolchains with libgcc_s

View File

@ -0,0 +1,7 @@
#!/bin/bash
set -ex
# Check that clang-format-diff is in PATH.
# rhbz#1939018
clang-format-diff -h

View File

@ -19,6 +19,9 @@
- libcxx-devel - libcxx-devel
- glibc-devel - glibc-devel
- gcc - gcc
# Required for clang-format-diff
- clang-tools-extra
repositories: repositories:
- repo: "https://src.fedoraproject.org/tests/llvm-test-suite.git" - repo: "https://src.fedoraproject.org/tests/llvm-test-suite.git"
dest: "llvm-test-suite" dest: "llvm-test-suite"
@ -33,3 +36,4 @@
- clang/rhbz_1657544 - clang/rhbz_1657544
- clang/rhbz_1647130 - clang/rhbz_1647130
- clang/llvm-toolchain - clang/llvm-toolchain
- clang-format-diff