rpms/llvm
8
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/llvm.git synced 2024-11-24 17:34:47 +00:00
Code Issues 5 Projects Releases Packages Wiki Activity Actions

More fixes for file lists

Browse source 
Fix these errors on s390x by excluding the files on that arch:

    File not found: /builddir/build/BUILDROOT/llvm-19.0.0~pre20240526.gc87a7b3bdb6737-1.fc41.s390x/usr/lib/clang/19/lib/s390x-redhat-linux-gnu/clang_rt.crtbegin.o
    File not found: /builddir/build/BUILDROOT/llvm-19.0.0~pre20240526.gc87a7b3bdb6737-1.fc41.s390x/usr/lib/clang/19/lib/s390x-redhat-linux-gnu/clang_rt.crtend.o
    File not found: /builddir/build/BUILDROOT/llvm-19.0.0~pre20240526.gc87a7b3bdb6737-1.fc41.s390x/usr/lib/clang/19/lib/s390x-redhat-linux-gnu/liborc_rt.a

Fix this error on i686 by explicitly creating the directory.
This matches what the implementation did pre-big-merge. I think
we do want to keep this directory structure consistent across all
arches.

    Directory not found: /builddir/build/BUILDROOT/llvm-19.0.0~pre20240526.gc87a7b3bdb6737-1.fc41.i386/usr/lib/clang/19/bin
This commit is contained in:
Nikita Popov 2024-05-27 09:05:05 +02:00 committed by Timm Bäder
parent 06767d80d8
commit c422c5daf7
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
files.spec.inc
View file

@ -358,9 +358,7 @@
%license clang/LICENSE.TXT %license clang/LICENSE.TXT
%dir %{install_prefix}/lib/clang/ %dir %{install_prefix}/lib/clang/
%dir %{install_prefix}/lib/clang/%{maj_ver}/ %dir %{install_prefix}/lib/clang/%{maj_ver}/
%ifarch x86_64 aarch64 %{ix86}
%dir %{install_prefix}/lib/clang/%{maj_ver}/bin/ %dir %{install_prefix}/lib/clang/%{maj_ver}/bin/
%endif
%dir %{install_prefix}/lib/clang/%{maj_ver}/include/ %dir %{install_prefix}/lib/clang/%{maj_ver}/include/
%dir %{install_prefix}/lib/clang/%{maj_ver}/lib/ %dir %{install_prefix}/lib/clang/%{maj_ver}/lib/
%dir %{install_prefix}/lib/clang/%{maj_ver}/share/ %dir %{install_prefix}/lib/clang/%{maj_ver}/share/
@ -515,13 +513,15 @@
%{_prefix}/lib/clang/%{maj_ver}/share/*.txt %{_prefix}/lib/clang/%{maj_ver}/share/*.txt
# Files that appear both in x86_64 and i686 # Files that appear on all targets
%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/clang_rt.crtbegin.o
%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/clang_rt.crtend.o
%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.* %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.*
# Files that don't appear in i686 %ifnarch s390x
%ifnarch %{ix86} %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/clang_rt.crtbegin.o
%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/clang_rt.crtend.o
%endif
%ifnarch %{ix86} s390x
%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/liborc_rt.a %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/liborc_rt.a
%endif %endif

2
install.spec.inc
View file

@ -182,7 +182,7 @@ chmod u-x %{buildroot}%{_mandir}/man1/scan-build.1*
# Create sub-directories in the clang resource directory that will be # Create sub-directories in the clang resource directory that will be
# populated by other packages # populated by other packages
mkdir -p %{buildroot}%{install_libdir}/clang/%{maj_ver}/{include,lib,share}/ mkdir -p %{buildroot}%{install_libdir}/clang/%{maj_ver}/{bin,include,lib,share}/
%if 0%{?fedora} == 38 %if 0%{?fedora} == 38
# Install config file # Install config file