- Remove *-devel packages from baselibs, they don't seem to be

needed. We mostly need libLLVM and maybe libclang-cpp.
- Add more conflicts/requirements to satisfy installcheck.
- Fix paths in clang-tools.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm13?expand=0&rev=18
This commit is contained in:
Aaron Puchert 2022-04-09 19:53:07 +00:00 committed by Git OBS Bridge
parent 873759c6e8
commit b2e7998d08
3 changed files with 19 additions and 8 deletions

View File

@ -1,8 +1,2 @@
libLLVM13
libclang-cpp13
llvm13-devel
provides "llvm-devel-<targettype> = <version>"
conflicts "otherproviders(llvm-devel-<targettype>)"
clang13-devel
provides "clang-devel-<targettype> = <version>"
conflicts "otherproviders(clang-devel-<targettype>)"

View File

@ -23,7 +23,8 @@ Sun Apr 3 13:42:27 UTC 2022 - Aaron Puchert <aaronpuchert@alice-dsl.net>
- Merge llvm-LTO-devel into llvm-devel. That's where the header
files already are, and they are hard to separate.
- Let llvm-polly-devel depend on llvm-devel.
- Remove libLTO from baselibs, it doesn't seem to be needed.
- Remove libLTO and *-devel packages from baselibs, they don't
seem to be needed. We mostly need libLLVM and maybe libclang-cpp.
- Only suggest documentation packages.
-------------------------------------------------------------------

View File

@ -214,6 +214,9 @@ Conflicts: llvm5
Conflicts: llvm7
%endif
Conflicts: cmake(LLVM)
# libLTO.so used to be a separate package.
Conflicts: libLTO.so < %{version}
Provides: libLTO.so = %{version}
Obsoletes: llvm%{_sonum}-LTO-devel <= %{version}
Provides: llvm%{_sonum}-LTO-devel = %{version}
Provides: llvm-devel-provider = %{version}
@ -378,6 +381,7 @@ Summary: C++ standard library implementation
Group: System/Libraries
URL: https://libcxx.llvm.org/
Requires: libc++abi%{_socxx} = %{version}
Conflicts: libc++%{_socxx} < %{version}
Provides: libc++%{_socxx} = %{version}
%description %{multisource libcxx%{_socxx}} libc++%{_socxx}
@ -388,7 +392,7 @@ standard library, targeting C++11.
Summary: C++ standard library implementation (devel package)
Group: Development/Libraries/C and C++
Requires: libc++%{_socxx} >= %{version}
Requires: libc++abi-devel = %{version}
Requires: libc++abi.so >= %{version}
Conflicts: libc++.so < %{version}
Provides: libc++.so = %{version}
@ -400,6 +404,7 @@ standard library, targeting C++11. (development files)
Summary: C++ standard library ABI
Group: System/Libraries
URL: https://libcxxabi.llvm.org/
Conflicts: libc++abi%{_socxx} < %{version}
Provides: libc++abi%{_socxx} = %{version}
%description %{multisource libcxxabi%{_socxx}} libc++abi%{_socxx}
@ -937,6 +942,17 @@ mv %{buildroot}%{_datadir}/clang/clang-format-diff.py %{buildroot}%{_bindir}/cla
mv %{buildroot}%{_datadir}/clang/clang-tidy-diff.py %{buildroot}%{_bindir}/clang-tidy-diff
mv %{buildroot}%{_datadir}/clang/run-find-all-symbols.py %{buildroot}%{_bindir}/run-find-all-symbols
# Fix paths to internal binaries.
sed -i "s|COMPILER_WRAPPER_\([A-Z]*\) = 'intercept-\([^']*\)'|COMPILER_WRAPPER_\1 = '%{_libexecdir_fallback}/intercept-\2'|" \
%{buildroot}%{_prefix}/lib/libscanbuild/intercept.py
%if "%{_libexecdir}" != "%{_prefix}/libexec"
LIBEXEC=%{_libexecdir_fallback}
RELATIVE_LIBEXEC=${LIBEXEC#%{_prefix}/}
RELATIVE_LIBEXEC_COMMA=${RELATIVE_LIBEXEC//\//\', \'}
sed -i "s|os.path.join(scanbuild_dir, '..', 'libexec', 'analyze-\([^']*\)')|os.path.join(scanbuild_dir, '..', '$RELATIVE_LIBEXEC_COMMA', 'analyze-\1')|" \
%{buildroot}%{_prefix}/lib/libscanbuild/analyze.py
%endif
mkdir -p %{buildroot}%{_datadir}/bash-completion/completions
mv %{buildroot}%{_datadir}/clang/bash-autocomplete.sh %{buildroot}%{_datadir}/bash-completion/completions/clang