diff --git a/README.md b/README.md index 54f637186b1adcb389bc5cc86566b767816bc08f..3787285382b341a42e512aeb1b29b7ff512b16af 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,8 @@ -# lld-15 +# lld #### 介绍 -LLVM Linker - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx +This package contains library and header files needed to develop new native +programs that use the LLD infrastructure. #### 参与贡献 diff --git a/lld.spec b/lld.spec index 8113ec68e4d082c0a45f7510d2037a1397c3fb3d..410dd468114ae26fdc67471b8fc606be5ee4bdf5 100644 --- a/lld.spec +++ b/lld.spec @@ -1,16 +1,25 @@ +%bcond_without sys_llvm %bcond_without check %global maj_ver 15 %global min_ver 0 %global patch_ver 7 +%if %{with sys_llvm} +%global pkg_name lld +%global install_prefix %{_prefix} +%else %global pkg_name lld%{maj_ver} -%global bin_suffix -%{maj_ver} %global install_prefix %{_libdir}/llvm%{maj_ver} -%global install_includedir %{install_prefix}/include -%global install_libdir %{install_prefix}/lib +%endif + %global install_bindir %{install_prefix}/bin -%global pkg_bindir %{install_bindir} +%if 0%{?__isa_bits} == 64 +%global install_libdir %{install_prefix}/lib64 +%else +%global install_libdir %{install_prefix}/lib +%endif +%global install_includedir %{install_prefix}/include # Don't include unittests in automatic generation of provides or requires. %global __provides_exclude_from ^%{_libdir}/lld/.*$ @@ -21,7 +30,7 @@ Name: %{pkg_name} Version: %{maj_ver}.%{min_ver}.%{patch_ver} -Release: 2 +Release: 3 Summary: The LLVM Linker License: NCSA @@ -32,9 +41,15 @@ Patch1: fedora-PATCH-lld-Import-compact_unwind_encoding.h-from-libu.patch BuildRequires: clang BuildRequires: cmake +%if %{with sys_llvm} +BuildRequires: llvm-devel = %{version} +BuildRequires: llvm-googletest = %{version} +BuildRequires: llvm-test = %{version} +%else BuildRequires: llvm%{maj_ver}-devel = %{version} BuildRequires: llvm%{maj_ver}-googletest = %{version} BuildRequires: llvm%{maj_ver}-test = %{version} +%endif BuildRequires: ncurses-devel BuildRequires: ninja-build BuildRequires: python3-rpm-macros @@ -79,8 +94,8 @@ cd _build -DLLVM_INCLUDE_TESTS=ON \ -DLLVM_EXTERNAL_LIT=%{_bindir}/lit \ -DLLVM_LIT_ARGS="-sv \ - --path %{_libdir}/llvm%{maj_ver}" \ - -DLLVM_MAIN_SRC_DIR=%{_libdir}/llvm%{maj_ver}/src + --path %{install_prefix}" \ + -DLLVM_MAIN_SRC_DIR=%{install_prefix}/src %ninja_build @@ -89,13 +104,6 @@ cd _build rm %{buildroot}%{install_includedir}/mach-o/compact_unwind_encoding.h -# Add version suffix to binaries -mkdir -p %{buildroot}/%{_bindir} -for f in %{buildroot}/%{install_bindir}/*; do - filename=`basename $f` - ln -s ../../%{install_bindir}/$filename %{buildroot}/%{_bindir}/$filename%{bin_suffix} -done - %check %if %{with check} cd _build @@ -104,12 +112,7 @@ cd _build %files %license LICENSE.TXT -%{_bindir}/lld%{bin_suffix} -%{_bindir}/lld-link%{bin_suffix} -%{_bindir}/ld.lld%{bin_suffix} -%{_bindir}/ld64.lld%{bin_suffix} -%{_bindir}/wasm-ld%{bin_suffix} -%{pkg_bindir} +%{install_bindir}/* %files devel %{install_includedir}/lld @@ -120,6 +123,9 @@ cd _build %{install_libdir}/liblld*.so.* %changelog +* Thu May 25 2023 cf-zhao - 15.0.7-3 +- Support building system llvm and multi-version llvm in one spec file. + * Wed Jun 7 2023 Chenxi Mao - 15.0.7-2 - Disable LTO as this causes crash if gcc lto enabled.