diff --git a/README.en.md b/README.en.md index 29b56e95b8bfd2d4e639df01e5d0901324a33568..8e8b6d8504da8794747d3f67549f6811e2a43075 100644 --- a/README.en.md +++ b/README.en.md @@ -1,22 +1,8 @@ -# lld-15 +# lld #### Description -LLVM Linker - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx +This package contains library and header files needed to develop new native +programs that use the LLD infrastructure. #### Contribution @@ -33,4 +19,4 @@ Software architecture description 3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) 4. The most valuable open source project [GVP](https://gitee.com/gvp) 5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) +6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) \ No newline at end of file diff --git a/README.md b/README.md index 3787285382b341a42e512aeb1b29b7ff512b16af..fa118f6f94452db788258fb20733f1b4b6d7952b 100644 --- a/README.md +++ b/README.md @@ -19,4 +19,4 @@ programs that use the LLD infrastructure. 3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目,是综合评定出的优秀开源项目 5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) +6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) \ No newline at end of file diff --git a/lld-12.0.1.src.tar.xz b/lld-12.0.1.src.tar.xz deleted file mode 100644 index 37a92f985cc7ef0702c1eb21196112a97896fe5d..0000000000000000000000000000000000000000 Binary files a/lld-12.0.1.src.tar.xz and /dev/null differ diff --git a/lld-12.0.1.src.tar.xz.sig b/lld-12.0.1.src.tar.xz.sig deleted file mode 100644 index 204df67467eed62345f781ae59b544e83fedd5b0..0000000000000000000000000000000000000000 Binary files a/lld-12.0.1.src.tar.xz.sig and /dev/null differ diff --git a/lld-17.0.6.src.tar.xz b/lld-17.0.6.src.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..6649129bf50b6b2ad2bce9f57598779aa7c55ab8 Binary files /dev/null and b/lld-17.0.6.src.tar.xz differ diff --git a/lld.spec b/lld.spec index c874307a874c8e9a9c80a91ce3c82d866678d11f..1556adf2a51c753a99611eb45e83ed019c97c240 100644 --- a/lld.spec +++ b/lld.spec @@ -1,18 +1,18 @@ -%bcond_with sys_llvm -%bcond_with check +%bcond_without sys_llvm +%bcond_without check -%global maj_ver 12 +%global maj_ver 17 %global min_ver 0 -%global patch_ver 1 +%global patch_ver 6 %if %{with sys_llvm} %global pkg_name lld -%global bin_suffix %{nil} %global install_prefix %{_prefix} +%global install_datadir %{_datadir} %else %global pkg_name lld%{maj_ver} -%global bin_suffix -%{maj_ver} %global install_prefix %{_libdir}/llvm%{maj_ver} +%global install_datadir %{install_prefix}/share %endif %global install_bindir %{install_prefix}/bin @@ -47,10 +47,12 @@ BuildRequires: cmake BuildRequires: llvm-devel = %{version} BuildRequires: llvm-googletest = %{version} BuildRequires: llvm-test = %{version} +BuildRequires: llvm-cmake-utils = %{version} %else BuildRequires: llvm%{maj_ver}-devel = %{version} BuildRequires: llvm%{maj_ver}-googletest = %{version} BuildRequires: llvm%{maj_ver}-test = %{version} +BuildRequires: llvm%{maj_ver}-cmake-utils = %{version} %endif BuildRequires: ncurses-devel BuildRequires: ninja-build @@ -97,6 +99,7 @@ cd _build -DLLVM_EXTERNAL_LIT=%{_bindir}/lit \ -DLLVM_LIT_ARGS="-sv \ --path %{install_prefix}" \ + -DLLVM_COMMON_CMAKE_UTILS=%{install_datadir}/llvm/cmake \ -DLLVM_MAIN_SRC_DIR=%{install_prefix}/src %ninja_build @@ -108,8 +111,7 @@ rm %{buildroot}%{install_includedir}/mach-o/compact_unwind_encoding.h %check %if %{with check} -cd _build -%ninja_build check-lld +%ninja_build check-lld -C _build %endif %files @@ -125,5 +127,8 @@ cd _build %{install_libdir}/liblld*.so.* %changelog +* Fri Dec 1 2023 zhoujing - 17.0.6-1 +- Update to 17.0.6 + * Thu May 25 2023 cf-zhao - 12.0.1-1 -- Package init +- Package init \ No newline at end of file