From e317298cdc268b8faf8aa3e49f00e589b09851a0 Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Tue, 4 Dec 2018 13:23:16 +0000 Subject: [PATCH] Ensure rpmlint passes on specfile --- compiler-rt.spec | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/compiler-rt.spec b/compiler-rt.spec index d70b8a1..2552182 100644 --- a/compiler-rt.spec +++ b/compiler-rt.spec @@ -7,7 +7,7 @@ Name: compiler-rt Version: 7.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: LLVM "compiler-rt" runtime libraries License: NCSA or MIT @@ -16,14 +16,14 @@ Source0: http://llvm.org/releases/%{version}/%{crt_srcdir}.tar.xz Patch0: 0001-cmake-Don-t-prefer-python2.7.patch -BuildRequires: gcc -BuildRequires: gcc-c++ +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: python3 # We need python3-devel for pathfix.py. BuildRequires: python3-devel -BuildRequires: llvm-devel = %{version} -BuildRequires: llvm-static = %{version} +BuildRequires: llvm-devel = %{version} +BuildRequires: llvm-static = %{version} %description The compiler-rt project is a part of the LLVM project. It provides @@ -44,9 +44,9 @@ cd _build -DLLVM_CONFIG_PATH:FILEPATH=%{_bindir}/llvm-config-%{__isa_bits} \ \ %if 0%{?__isa_bits} == 64 - -DLLVM_LIBDIR_SUFFIX=64 \ + -DLLVM_LIBDIR_SUFFIX=64 \ %else - -DLLVM_LIBDIR_SUFFIX= \ + -DLLVM_LIBDIR_SUFFIX= \ %endif -DCOMPILER_RT_INCLUDE_TESTS:BOOL=OFF # could be on? @@ -67,7 +67,8 @@ for file in %{aarch64_blacklists} asan_blacklist.txt msan_blacklist.txt dfsan_bl done # move sanitizer libs to better place -mv -v %{buildroot}%{_prefix}/lib/linux/libclang_rt* %{buildroot}%{_libdir}/clang/%{version}/lib +%global libclang_rt_installdir lib/linux +mv -v %{buildroot}%{_prefix}/%{libclang_rt_installdir}/libclang_rt* %{buildroot}%{_libdir}/clang/%{version}/lib mkdir -p %{buildroot}%{_libdir}/clang/%{version}/lib/linux/ pushd %{buildroot}%{_libdir}/clang/%{version}/lib for i in *.a *.syms *.so; do @@ -83,6 +84,9 @@ cd _build %{_libdir}/clang/%{version} %changelog +* Tue Dec 04 2018 sguelton@redhat.com - 7.0.0-2 +- Ensure rpmlint passes on specfile + * Mon Sep 24 2018 Tom Stellard - 7.0.0-1 - 7.0.0-1 Release