diff --git a/README.en.md b/README.en.md index b8efe80..ebf049d 100644 --- a/README.en.md +++ b/README.en.md @@ -3,21 +3,6 @@ #### Description LLVM OpenMP Libraries -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - #### Contribution 1. Fork the repository @@ -25,7 +10,6 @@ Software architecture description 3. Commit your code 4. Create Pull Request - #### Gitee Feature 1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md diff --git a/README.md b/README.md index 639a0f3..7d1288f 100644 --- a/README.md +++ b/README.md @@ -3,22 +3,6 @@ #### 介绍 LLVM OpenMP Libraries -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - #### 参与贡献 1. Fork 本仓库 @@ -26,7 +10,6 @@ LLVM OpenMP Libraries 3. 提交代码 4. 新建 Pull Request - #### 特技 1. 使用 Readme\_XXX.md 来支持不同的语言,例如 Readme\_en.md, Readme\_zh.md diff --git a/openmp-12.0.1.src.tar.xz b/openmp-12.0.1.src.tar.xz deleted file mode 100644 index e27e9ba..0000000 Binary files a/openmp-12.0.1.src.tar.xz and /dev/null differ diff --git a/openmp-17.0.6.src.tar.xz b/openmp-17.0.6.src.tar.xz new file mode 100644 index 0000000..b6cbb6a Binary files /dev/null and b/openmp-17.0.6.src.tar.xz differ diff --git a/openmp.spec b/openmp.spec index a05c729..c48e70d 100644 --- a/openmp.spec +++ b/openmp.spec @@ -1,18 +1,22 @@ -%bcond_with sys_llvm +%bcond_without sys_llvm %bcond_with check -%global maj_ver 12 +%global toolchain clang + +%global maj_ver 17 %global min_ver 0 -%global patch_ver 1 +%global patch_ver 6 %global openmp_version %{maj_ver}.%{min_ver}.%{patch_ver} %global openmp_srcdir openmp-%{openmp_version}.src %if %{with sys_llvm} %global pkg_name libomp %global install_prefix %{_prefix} +%global install_datadir %{_datadir} %else %global pkg_name libomp%{maj_ver} %global install_prefix %{_libdir}/llvm%{maj_ver} +%global install_datadir %{install_prefix}/share %endif %global install_includedir %{install_prefix}/include @@ -50,9 +54,11 @@ BuildRequires: clang-tools-extra %if %{with sys_llvm} BuildRequires: llvm-devel llvm-test +BuildRequires: llvm-cmake-utils = %{version} %else BuildRequires: llvm%{maj_ver}-devel BuildRequires: llvm%{maj_ver}-test +BuildRequires: llvm%{maj_ver}-cmake-utils = %{version} %endif Requires: elfutils-libelf%{?isa} @@ -71,8 +77,7 @@ Requires: clang%{maj_ver}-resource-filesystem%{?isa} = %{version} %description devel OpenMP header files. - - + %prep %autosetup -n %{openmp_srcdir} -p2 @@ -81,9 +86,9 @@ OpenMP header files. %cmake -GNinja \ -DCMAKE_INSTALL_PREFIX=%{install_prefix} \ -DLIBOMP_INSTALL_ALIASES=OFF \ - -DCMAKE_MODULE_PATH=%{install_libdir}/cmake/llvm \ + -DCMAKE_MODULE_PATH=%{install_datadir}/llvm/cmake/Modules \ -DLLVM_DIR=%{install_libdir}/cmake/llvm \ - -DCMAKE_INSTALL_INCLUDEDIR=%{install_libdir}/clang/%{openmp_version}/include \ + -DCMAKE_INSTALL_INCLUDEDIR=%{install_libdir}/clang/%{maj_ver}/include \ %if 0%{?__isa_bits} == 64 -DOPENMP_LIBDIR_SUFFIX=64 \ %else @@ -100,19 +105,42 @@ rm -rf %{buildroot}%{install_libdir}/libarcher_static.a %check %files +%license LICENSE.TXT %{install_libdir}/libomp.so +%{install_libdir}/libompd.so %ifnarch %{arm} %{install_libdir}/libarcher.so %endif +%ifnarch %{ix86} %{arm} riscv64 +%{install_libdir}/libomptarget.rtl.amdgpu.so.%{maj_ver} +%{install_libdir}/libomptarget.rtl.cuda.so.%{maj_ver} +%{install_libdir}/libomptarget.rtl.%{libomp_arch}.so.%{maj_ver} +%endif +%{install_libdir}/libomptarget.so.%{maj_ver} %files devel -%{install_includedir}/omp.h +%{install_libdir}/clang/%{maj_ver}/include/omp.h +%{install_libdir}/cmake/openmp/FindOpenMPTarget.cmake %ifnarch %{arm} -%{install_includedir}/omp-tools.h -%{install_includedir}/ompt.h -%{install_includedir}/ompt-multiplex.h +%{install_libdir}/clang/%{maj_ver}/include/omp-tools.h +%{install_libdir}/clang/%{maj_ver}/include/ompt.h +%{install_libdir}/clang/%{maj_ver}/include/ompt-multiplex.h %endif +%ifnarch %{ix86} %{arm} +%ifnarch riscv64 +%{install_libdir}/libomptarget.rtl.amdgpu.so +%{install_libdir}/libomptarget.rtl.cuda.so +%{install_libdir}/libomptarget.rtl.%{libomp_arch}.so +%endif +%{install_libdir}/libomptarget.devicertl.a +%{install_libdir}/libomptarget-amdgpu-*.bc +%{install_libdir}/libomptarget-nvptx-*.bc +%endif +%{install_libdir}/libomptarget.so %changelog +* Mon Dec 4 2023 zhoujing - 17.0.6-1 +- Update to 17.0.6 + * Sat Aug 26 2023 cf-zhao - 12.0.1-1 - Initial version to 12.0.1