From bdef5bb591b6a32b12dcea76c9a3728dd32bcfe9 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 27 May 2024 09:05:05 +0200 Subject: [PATCH] More fixes for file lists 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 --- files.spec.inc | 14 +++++++------- install.spec.inc | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/files.spec.inc b/files.spec.inc index 904e8cc..eb23e29 100644 --- a/files.spec.inc +++ b/files.spec.inc @@ -358,9 +358,7 @@ %license clang/LICENSE.TXT %dir %{install_prefix}/lib/clang/ %dir %{install_prefix}/lib/clang/%{maj_ver}/ -%ifarch x86_64 aarch64 %{ix86} %dir %{install_prefix}/lib/clang/%{maj_ver}/bin/ -%endif %dir %{install_prefix}/lib/clang/%{maj_ver}/include/ %dir %{install_prefix}/lib/clang/%{maj_ver}/lib/ %dir %{install_prefix}/lib/clang/%{maj_ver}/share/ @@ -515,13 +513,15 @@ %{_prefix}/lib/clang/%{maj_ver}/share/*.txt -# Files that appear both in x86_64 and i686 -%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/clang_rt.crtbegin.o -%{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/clang_rt.crtend.o +# Files that appear on all targets %{_prefix}/lib/clang/%{maj_ver}/lib/%{llvm_triple}/libclang_rt.* -# Files that don't appear in i686 -%ifnarch %{ix86} +%ifnarch s390x +%{_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 %endif diff --git a/install.spec.inc b/install.spec.inc index cdb7da0..0f11287 100644 --- a/install.spec.inc +++ b/install.spec.inc @@ -182,7 +182,7 @@ chmod u-x %{buildroot}%{_mandir}/man1/scan-build.1* # Create sub-directories in the clang resource directory that will be # 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 # Install config file