rpms/llvm
2
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/llvm.git synced 2024-10-18 18:25:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some paths

Browse source
This commit is contained in:
Nikita Popov 2024-07-31 15:57:48 +00:00 committed by Timm Bäder
parent 1ad15a1548
commit 1434c4a0c2
3 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.spec.inc
View file

@ -74,7 +74,11 @@ popd
-DCLANG_LINK_CLANG_DYLIB=ON \ -DCLANG_LINK_CLANG_DYLIB=ON \
-DCLANG_BUILD_EXAMPLES:BOOL=OFF \ -DCLANG_BUILD_EXAMPLES:BOOL=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} \ -DCLANG_RESOURCE_DIR=../lib/clang/%{maj_ver} \
%else
-DCLANG_RESOURCE_DIR=../../../lib/clang/%{maj_ver} \
%endif
-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR=../clang-tools-extra \ -DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR=../clang-tools-extra \
-DCLANG_CONFIG_FILE_SYSTEM_DIR=%{_sysconfdir}/%{pkg_name_clang}/ \ -DCLANG_CONFIG_FILE_SYSTEM_DIR=%{_sysconfdir}/%{pkg_name_clang}/ \
-DCLANG_DEFAULT_UNWINDLIB=libgcc \ -DCLANG_DEFAULT_UNWINDLIB=libgcc \

14
files.spec.inc
View file

@ -351,7 +351,7 @@
%files -n %{pkg_name_clang}-libs %files -n %{pkg_name_clang}-libs
%license clang/LICENSE.TXT %license clang/LICENSE.TXT
%{install_prefix}/lib/clang/%{maj_ver}/include/* %{_prefix}/lib/clang/%{maj_ver}/include/*
%{install_libdir}/libclang.so.* %{install_libdir}/libclang.so.*
%{install_libdir}/libclang-cpp.so.* %{install_libdir}/libclang-cpp.so.*
@ -370,12 +370,12 @@
%files -n %{pkg_name_clang}-resource-filesystem %files -n %{pkg_name_clang}-resource-filesystem
%license clang/LICENSE.TXT %license clang/LICENSE.TXT
%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/
%{_rpmmacrodir}/macros.%{pkg_name_clang} %{_rpmmacrodir}/macros.%{pkg_name_clang}
%files -n %{pkg_name_clang}-analyzer %files -n %{pkg_name_clang}-analyzer

20
install.spec.inc
View file

@ -164,29 +164,29 @@ ln -s ../../%{install_bindir}/clang++ %{buildroot}%{install_bindir}/clang++-%{m
%endif %endif
# Fix permissions of scan-view scripts # Fix permissions of scan-view scripts
chmod a+x %{buildroot}%{_datadir}/scan-view/{Reporter.py,startfile.py} chmod a+x %{buildroot}%{install_datadir}/scan-view/{Reporter.py,startfile.py}
# multilib fix # multilib fix
%multilib_fix_c_header --file %{_includedir}/clang/Config/config.h %multilib_fix_c_header --file %{install_includedir}/clang/Config/config.h
# remove editor integrations (bbedit, sublime, emacs, vim) # remove editor integrations (bbedit, sublime, emacs, vim)
rm -vf %{buildroot}%{_datadir}/clang/clang-format-bbedit.applescript rm -vf %{buildroot}%{install_datadir}/clang/clang-format-bbedit.applescript
rm -vf %{buildroot}%{_datadir}/clang/clang-format-sublime.py* rm -vf %{buildroot}%{install_datadir}/clang/clang-format-sublime.py*
# TODO: Package html docs # TODO: Package html docs
rm -Rvf %{buildroot}%{_docdir}/LLVM/clang/html rm -Rvf %{buildroot}%{install_docdir}/LLVM/clang/html
rm -Rvf %{buildroot}%{_docdir}/LLVM/clang-tools/html rm -Rvf %{buildroot}%{install_docdir}/LLVM/clang-tools/html
rm -Rvf %{buildroot}%{_datadir}/clang-doc/clang-doc-default-stylesheet.css rm -Rvf %{buildroot}%{install_datadir}/clang-doc/clang-doc-default-stylesheet.css
rm -Rvf %{buildroot}%{_datadir}/clang-doc/index.js rm -Rvf %{buildroot}%{install_datadir}/clang-doc/index.js
# TODO: What are the Fedora guidelines for packaging bash autocomplete files? # TODO: What are the Fedora guidelines for packaging bash autocomplete files?
rm -vf %{buildroot}%{_datadir}/clang/bash-autocomplete.sh 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}%{_prefix}/lib/clang/%{maj_ver}/{bin,include,lib,share}/ mkdir -p %{buildroot}%{_prefix}/lib/clang/%{maj_ver}/{bin,include,lib,share}/
#Add versioned resource directory macro # Add versioned resource directory macro
mkdir -p %{buildroot}%{_rpmmacrodir}/ mkdir -p %{buildroot}%{_rpmmacrodir}/
echo "%%clang%{maj_ver}_resource_dir %%{_prefix}/lib/clang/%{maj_ver}" >> %{buildroot}%{_rpmmacrodir}/macros.%{name} echo "%%clang%{maj_ver}_resource_dir %%{_prefix}/lib/clang/%{maj_ver}" >> %{buildroot}%{_rpmmacrodir}/macros.%{name}