rpms/clang17
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for clang resource directory

Browse Source 
- Fix clang resource directory to match compiler-rt
- Fix provides for clang-resource-filesystem
This commit is contained in:
Tom Stellard 2024-03-06 20:24:38 +00:00
parent d80af1e4d4
commit 9ec3807f99
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
clang17.spec
View File

@ -67,7 +67,7 @@
Name: %pkg_name Name: %pkg_name
Version: %{clang_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}} Version: %{clang_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
Release: 6%{?dist} Release: 7%{?dist}
Summary: A C language family front-end for LLVM Summary: A C language family front-end for LLVM
License: Apache-2.0 WITH LLVM-exception OR NCSA License: Apache-2.0 WITH LLVM-exception OR NCSA
@ -231,7 +231,7 @@ Development header files for clang.
%package resource-filesystem %package resource-filesystem
Summary: Filesystem package that owns the clang resource directory Summary: Filesystem package that owns the clang resource directory
Provides: %{name}-resource-filesystem(major) = %{maj_ver} Provides: clang-resource-filesystem(major) = %{maj_ver}
# This package can't be noarch for compat builds, becuase the x86_64 and i686 # This package can't be noarch for compat builds, becuase the x86_64 and i686
# builds are installed to different prefixes. # builds are installed to different prefixes.
%if %{without compat_build} %if %{without compat_build}
@ -412,7 +412,11 @@ rm test/CodeGen/profile-filter.c
-DCLANG_BUILD_EXAMPLES:BOOL=OFF \ -DCLANG_BUILD_EXAMPLES:BOOL=OFF \
-DBUILD_SHARED_LIBS=OFF \ -DBUILD_SHARED_LIBS=OFF \
-DCLANG_REPOSITORY_STRING="%{?dist_vendor} %{version}-%{release}" \ -DCLANG_REPOSITORY_STRING="%{?dist_vendor} %{version}-%{release}" \
%if %{with compat_build}
-DCLANG_RESOURCE_DIR=../../../lib/clang/%{maj_ver} \
%else
-DCLANG_RESOURCE_DIR=../lib/clang/%{maj_ver} \ -DCLANG_RESOURCE_DIR=../lib/clang/%{maj_ver} \
%endif
-DCLANG_DEFAULT_UNWINDLIB=libgcc -DCLANG_DEFAULT_UNWINDLIB=libgcc
%cmake_build %cmake_build
@ -506,7 +510,7 @@ rm -vf %{buildroot}%{install_datadir}/clang/bash-autocomplete.sh
# 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_prefix}/lib/clang/%{maj_ver}/{bin,include,lib,share}/ mkdir -p %{buildroot}%{_prefix}/lib/clang/%{maj_ver}/{bin,include,lib,share}/
%check %check
@ -541,7 +545,7 @@ LD_LIBRARY_PATH=%{buildroot}/%{install_libdir} %{__ninja} check-all -C %{__cmake
%endif %endif
%files libs %files libs
%{install_prefix}/lib/clang/%{maj_ver}/include/* %{_prefix}/lib/clang/%{maj_ver}/include/*
%{install_libdir}/*.so.* %{install_libdir}/*.so.*
%files devel %files devel
@ -556,12 +560,12 @@ LD_LIBRARY_PATH=%{buildroot}/%{install_libdir} %{__ninja} check-all -C %{__cmake
%dir %{install_datadir}/clang/ %dir %{install_datadir}/clang/
%files resource-filesystem %files resource-filesystem
%dir %{install_prefix}/lib/clang/ %dir %{_prefix}/lib/clang/
%dir %{install_prefix}/lib/clang/%{maj_ver}/ %dir %{_prefix}/lib/clang/%{maj_ver}/
%dir %{install_prefix}/lib/clang/%{maj_ver}/bin/ %dir %{_prefix}/lib/clang/%{maj_ver}/bin/
%dir %{install_prefix}/lib/clang/%{maj_ver}/include/ %dir %{_prefix}/lib/clang/%{maj_ver}/include/
%dir %{install_prefix}/lib/clang/%{maj_ver}/lib/ %dir %{_prefix}/lib/clang/%{maj_ver}/lib/
%dir %{install_prefix}/lib/clang/%{maj_ver}/share/ %dir %{_prefix}/lib/clang/%{maj_ver}/share/
%if %{without compat_build} %if %{without compat_build}
%{_rpmmacrodir}/macros.%{name} %{_rpmmacrodir}/macros.%{name}
%endif %endif
@ -688,6 +692,10 @@ LD_LIBRARY_PATH=%{buildroot}/%{install_libdir} %{__ninja} check-all -C %{__cmake
%endif %endif
%changelog %changelog
* Wed Mar 06 2024 Tom Stellard <tstellar@redhat.com> - 17.0.6-7
- Fix clang resource directory to match compiler-rt
- Fix provides for clang-resource-filesystem
* Fri Jan 26 2024 Kefu Chai <kefu.chai@scylladb.com> - 17.0.6-6 * Fri Jan 26 2024 Kefu Chai <kefu.chai@scylladb.com> - 17.0.6-6
- Fix the too-early instantiation of conditional "explict" by applying the patch - Fix the too-early instantiation of conditional "explict" by applying the patch
of https://github.com/llvm/llvm-project/commit/128b3b61fe6768c724975fd1df2be0abec848cf6 of https://github.com/llvm/llvm-project/commit/128b3b61fe6768c724975fd1df2be0abec848cf6