#193 Fix the distribution of duplicated files in the compat package
Opened 2 months ago by tuliom. Modified 2 months ago
rpms/ tuliom/llvm compat18  into  rawhide

file modified
+8 -8
@@ -365,16 +365,16 @@ 

  # Remove testing of update utility tools

  rm -rf test/tools/UpdateTestChecks

  

- # Install libraries needed for unittests

- %if %{without compat_build}

- %global build_libdir %{_vpath_builddir}/%{_lib}

- %else

- %global build_libdir %{_vpath_builddir}/lib

+ %if %{with compat_build}

+ %global build_libdir %{buildroot}%{install_libdir}/../lib64/

+ # Remove files that get duplicated in compat build and distribute only the

+ # ones in %{install_libdir}.

+ rm -f %{build_libdir}/libLLVMTestingSupport.a \

+       %{build_libdir}/libLLVMTestingAnnotations.a \

+       %{build_libdir}/libllvm_gtest.a \

+       %{build_libdir}/libllvm_gtest_main.a

  %endif

  

- install %{build_libdir}/libLLVMTestingSupport.a %{buildroot}%{install_libdir}

- install %{build_libdir}/libLLVMTestingAnnotations.a %{buildroot}%{install_libdir}

- 

  # Fix multi-lib

  %multilib_fix_c_header --file %{install_includedir}/llvm/Config/llvm-config.h

  

After installing the files with cmake, 4 static libraries end up being
installed in both /usr/lib64/llvm18/lib and /usr/lib64/llvm18/lib64.

Remove the files from the later, keeping only the first ones available.

This commit is also removing old code that is not needed anymore.

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/4a89279af0364f57aeffe8dc93db8cc9

Do you know why the duplicate installation happens? Is that something that can be fixed in upstream cmake?

Metadata