rpms/llvm
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove pkg_bindir and pkg_libdir

Browse Source 
Replace them witn install_bindir and install_libdir respectively.
This commit is contained in:
Tulio Magno Quites Machado Filho 2023-07-31 09:36:31 -03:00 committed by tuliom
parent b5d6c1ccf0
commit d180d56a78
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
llvm.spec
View File

@ -34,17 +34,14 @@
%global install_includedir %{install_prefix}/include %global install_includedir %{install_prefix}/include
%global install_libdir %{install_prefix}/lib %global install_libdir %{install_prefix}/lib
%global pkg_bindir %{install_bindir}
%global pkg_includedir %{_includedir}/%{name} %global pkg_includedir %{_includedir}/%{name}
%global pkg_libdir %{install_libdir}
%global pkg_datadir %{install_prefix}/share %global pkg_datadir %{install_prefix}/share
%else %else
%global pkg_name llvm %global pkg_name llvm
%global install_prefix /usr %global install_prefix /usr
%global install_bindir %{_bindir}
%global install_libdir %{_libdir} %global install_libdir %{_libdir}
%global install_includedir %{_includedir} %global install_includedir %{_includedir}
%global pkg_bindir %{_bindir}
%global pkg_libdir %{install_libdir}
%global pkg_datadir %{_datadir} %global pkg_datadir %{_datadir}
%global exec_suffix %{nil} %global exec_suffix %{nil}
%endif %endif
@ -393,7 +390,7 @@ ln -s ../../../%{install_includedir}/llvm-c %{buildroot}/%{pkg_includedir}/llvm-
# Create ld.so.conf.d entry # Create ld.so.conf.d entry
mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf << EOF cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf << EOF
%{pkg_libdir} %{install_libdir}
EOF EOF
# Add version suffix to man pages and move them to mandir. # Add version suffix to man pages and move them to mandir.
@ -415,19 +412,19 @@ rm -Rf %{build_install_prefix}/share/opt-viewer
%if %{without compat_build} %if %{without compat_build}
mv %{buildroot}/%{pkg_bindir}/llvm-config %{buildroot}/%{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} mv %{buildroot}/%{install_bindir}/llvm-config %{buildroot}/%{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}
# We still maintain a versionned symlink for consistency across llvm versions. # We still maintain a versionned symlink for consistency across llvm versions.
# This is specific to the non-compat build and matches the exec prefix for # This is specific to the non-compat build and matches the exec prefix for
# compat builds. An isa-agnostic versionned symlink is also maintained in the (un)install # compat builds. An isa-agnostic versionned symlink is also maintained in the (un)install
# steps. # steps.
(cd %{buildroot}/%{pkg_bindir} ; ln -s llvm-config%{exec_suffix}-%{__isa_bits} llvm-config-%{maj_ver}-%{__isa_bits} ) (cd %{buildroot}/%{install_bindir} ; ln -s llvm-config%{exec_suffix}-%{__isa_bits} llvm-config-%{maj_ver}-%{__isa_bits} )
# ghost presence # ghost presence
touch %{buildroot}%{_bindir}/llvm-config-%{maj_ver} touch %{buildroot}%{_bindir}/llvm-config-%{maj_ver}
%else %else
rm %{buildroot}%{_bindir}/llvm-config%{exec_suffix} rm %{buildroot}%{_bindir}/llvm-config%{exec_suffix}
(cd %{buildroot}/%{pkg_bindir} ; ln -s llvm-config llvm-config%{exec_suffix}-%{__isa_bits} ) (cd %{buildroot}/%{install_bindir} ; ln -s llvm-config llvm-config%{exec_suffix}-%{__isa_bits} )
%endif %endif
@ -452,7 +449,7 @@ rm test/tools/dsymutil/X86/swift-interface.test
%if %{with check} %if %{with check}
# FIXME: use %%cmake_build instead of %%__ninja # FIXME: use %%cmake_build instead of %%__ninja
LD_LIBRARY_PATH=%{buildroot}/%{pkg_libdir} %{__ninja} check-all -C %{_vpath_builddir} LD_LIBRARY_PATH=%{buildroot}/%{install_libdir} %{__ninja} check-all -C %{_vpath_builddir}
%endif %endif
%endif %endif
@ -460,16 +457,16 @@ LD_LIBRARY_PATH=%{buildroot}/%{pkg_libdir} %{__ninja} check-all -C %{_vpath_bui
%ldconfig_scriptlets libs %ldconfig_scriptlets libs
%post devel %post devel
%{_sbindir}/update-alternatives --install %{_bindir}/llvm-config%{exec_suffix} llvm-config%{exec_suffix} %{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{__isa_bits} %{_sbindir}/update-alternatives --install %{_bindir}/llvm-config%{exec_suffix} llvm-config%{exec_suffix} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{__isa_bits}
%if %{without compat_build} %if %{without compat_build}
%{_sbindir}/update-alternatives --install %{_bindir}/llvm-config-%{maj_ver} llvm-config-%{maj_ver} %{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{__isa_bits} %{_sbindir}/update-alternatives --install %{_bindir}/llvm-config-%{maj_ver} llvm-config-%{maj_ver} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{__isa_bits}
%endif %endif
%postun devel %postun devel
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
%{_sbindir}/update-alternatives --remove llvm-config%{exec_suffix} %{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{_sbindir}/update-alternatives --remove llvm-config%{exec_suffix} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}
%if %{without compat_build} %if %{without compat_build}
%{_sbindir}/update-alternatives --remove llvm-config-%{maj_ver} %{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{_sbindir}/update-alternatives --remove llvm-config-%{maj_ver} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}
%endif %endif
fi fi
@ -480,11 +477,11 @@ fi
%{_bindir}/* %{_bindir}/*
%exclude %{_bindir}/llvm-config%{exec_suffix} %exclude %{_bindir}/llvm-config%{exec_suffix}
%exclude %{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %exclude %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}
%if %{without compat_build} %if %{without compat_build}
%exclude %{_bindir}/llvm-config-%{maj_ver} %exclude %{_bindir}/llvm-config-%{maj_ver}
%exclude %{pkg_bindir}/llvm-config-%{maj_ver}-%{__isa_bits} %exclude %{install_bindir}/llvm-config-%{maj_ver}-%{__isa_bits}
%exclude %{_bindir}/not %exclude %{_bindir}/not
%exclude %{_bindir}/count %exclude %{_bindir}/count
%exclude %{_bindir}/yaml-bench %exclude %{_bindir}/yaml-bench
@ -493,12 +490,12 @@ fi
%exclude %{_bindir}/llvm-opt-fuzzer %exclude %{_bindir}/llvm-opt-fuzzer
%{_datadir}/opt-viewer %{_datadir}/opt-viewer
%else %else
%{pkg_bindir} %{install_bindir}
%endif %endif
%files libs %files libs
%license LICENSE.TXT %license LICENSE.TXT
%{pkg_libdir}/libLLVM-%{maj_ver}.so %{install_libdir}/libLLVM-%{maj_ver}.so
%if %{without compat_build} %if %{without compat_build}
%if %{with gold} %if %{with gold}
%{_libdir}/LLVMgold.so %{_libdir}/LLVMgold.so
@ -511,17 +508,17 @@ fi
%if %{with gold} %if %{with gold}
%{_libdir}/%{name}/lib/LLVMgold.so %{_libdir}/%{name}/lib/LLVMgold.so
%endif %endif
%{pkg_libdir}/libLLVM-%{maj_ver}.%{min_ver}*.so %{install_libdir}/libLLVM-%{maj_ver}.%{min_ver}*.so
%{pkg_libdir}/libLTO.so* %{install_libdir}/libLTO.so*
%exclude %{pkg_libdir}/libLTO.so %exclude %{install_libdir}/libLTO.so
%endif %endif
%{pkg_libdir}/libRemarks.so* %{install_libdir}/libRemarks.so*
%files devel %files devel
%license LICENSE.TXT %license LICENSE.TXT
%ghost %{_bindir}/llvm-config%{exec_suffix} %ghost %{_bindir}/llvm-config%{exec_suffix}
%{pkg_bindir}/llvm-config%{exec_suffix}-%{__isa_bits} %{install_bindir}/llvm-config%{exec_suffix}-%{__isa_bits}
%{_mandir}/man1/llvm-config* %{_mandir}/man1/llvm-config*
%{install_includedir}/llvm %{install_includedir}/llvm
@ -529,12 +526,12 @@ fi
%{install_libdir}/libLLVM.so %{install_libdir}/libLLVM.so
%{install_libdir}/cmake/llvm %{install_libdir}/cmake/llvm
%if %{without compat_build} %if %{without compat_build}
%{pkg_bindir}/llvm-config-%{maj_ver}-%{__isa_bits} %{install_bindir}/llvm-config-%{maj_ver}-%{__isa_bits}
%ghost %{_bindir}/llvm-config-%{maj_ver} %ghost %{_bindir}/llvm-config-%{maj_ver}
%else %else
%{pkg_includedir}/llvm %{pkg_includedir}/llvm
%{pkg_includedir}/llvm-c %{pkg_includedir}/llvm-c
%{pkg_libdir}/libLTO.so %{install_libdir}/libLTO.so
%endif %endif
%files doc %files doc