README.en.md

@@ -1,23 +1,8 @@
-# openmp-latest
+# openmp
 
 #### 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

README.md

@@ -1,24 +1,8 @@
-# openmp-latest
+# openmp
 
 #### 介绍
 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

openmp.spec

@@ -1,20 +1,28 @@
+%bcond_without sys_llvm
 %bcond_with check
 %bcond_without toolchain_clang
 
+%if %{with toolchain_clang}
+%global toolchain clang
+%endif
+
 %global toolchain clang
 
-%global maj_ver 18
+%global maj_ver 17
-%global min_ver 1
+%global min_ver 0
-%global patch_ver 8
+%global patch_ver 6
 %global openmp_version %{maj_ver}.%{min_ver}.%{patch_ver}
 %global openmp_srcdir openmp-%{openmp_version}.src
 
-%global _scl_prefix /opt/openEuler
+%if %{with sys_llvm}
-%{?scl:%scl_package %scl}
+%global pkg_name libomp
-%{!?scl:%global scl_prefix llvm-toolset-%{maj_ver}-}
+%global install_prefix %{_prefix}
-%{!?scl:%global pkg_name %{name}}
+%global install_datadir %{_datadir}
-%global install_prefix %{!?scl:%{_scl_prefix}/llvm-toolset-%{maj_ver}/root}%{_prefix}
+%else
-%global install_datadir %{!?scl:%{_scl_prefix}/llvm-toolset-%{maj_ver}/root}%{_datadir}
+%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
 %global install_libdir %{install_prefix}/%{_lib}
@@ -27,7 +35,7 @@
 %global libomp_arch %{_arch}
 %endif
 
-Name:    %{?scl_prefix}openmp
+Name:    %{pkg_name}
 Version: %{openmp_version}
 Release: 2
 Summary: OpenMP runtime for clang
@@ -46,12 +54,17 @@ BuildRequires: perl-Encode
 BuildRequires: libffi-devel
 %if "%toolchain" == "clang"
 BuildRequires: clang
+BuildRequires: clang-tools-extra
 %endif
-BuildRequires: %{?scl_prefix}clang
-BuildRequires: %{?scl_prefix}clang-tools-extra
 
-BuildRequires: %{?scl_prefix}llvm-devel %{?scl_prefix}llvm-test
+%if %{with sys_llvm}
-BuildRequires: %{?scl_prefix}llvm-cmake-utils = %{version}
+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}
 
@@ -60,8 +73,12 @@ OpenMP runtime for clang.
  
 %package devel
 Summary: OpenMP header files
-Requires: %{pkg_name}%{?isa} = %{version}-%{release}
+Requires: %{name}%{?isa} = %{version}-%{release}
-Requires: %{?scl_prefix}clang-resource-filesystem%{?isa} = %{version}
+%if %{with sys_llvm}
+Requires: clang-resource-filesystem%{?isa} = %{version}
+%else
+Requires: clang%{maj_ver}-resource-filesystem%{?isa} = %{version}
+%endif
  
 %description devel
 OpenMP header files.
@@ -104,26 +121,21 @@ rm -rf %{buildroot}%{install_libdir}/libarcher_static.a
 %{install_libdir}/libarcher.so
 %endif
 %ifnarch %{ix86} %{arm} riscv64
-# libomptarget is not supported on 32-bit systems.
+%{install_libdir}/libomptarget.rtl.amdgpu.so.%{maj_ver}
-%{install_libdir}/libomptarget.rtl.amdgpu.so.%{maj_ver}.%{min_ver}
+%{install_libdir}/libomptarget.rtl.cuda.so.%{maj_ver}
-%{install_libdir}/libomptarget.rtl.cuda.so.%{maj_ver}.%{min_ver}
+%{install_libdir}/libomptarget.rtl.%{libomp_arch}.so.%{maj_ver}
-%{install_libdir}/libomptarget.rtl.%{libomp_arch}.so.%{maj_ver}.%{min_ver}
-%endif
-%ifnarch %{ix86} %{arm}
-%{install_libdir}/libomptarget.so.%{maj_ver}.%{min_ver}
 %endif
+%{install_libdir}/libomptarget.so.%{maj_ver}
  
 %files devel
 %{install_libdir}/clang/%{maj_ver}/include/omp.h
-%{install_libdir}/clang/%{maj_ver}/include/ompx.h
+%{install_libdir}/cmake/openmp/FindOpenMPTarget.cmake
-%{install_libdir}/cmake/openmp/
 %ifnarch %{arm}
 %{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}
-# libomptarget is not supported on 32-bit systems.
 %ifnarch riscv64
 %{install_libdir}/libomptarget.rtl.amdgpu.so
 %{install_libdir}/libomptarget.rtl.cuda.so
@@ -132,28 +144,13 @@ rm -rf %{buildroot}%{install_libdir}/libarcher_static.a
 %{install_libdir}/libomptarget.devicertl.a
 %{install_libdir}/libomptarget-amdgpu-*.bc
 %{install_libdir}/libomptarget-nvptx-*.bc
-%{install_libdir}/libomptarget.so
 %endif
+%{install_libdir}/libomptarget.so
  
 %changelog
-* Tue Dec 31 2024 laokz <zhangkai@iscas.ac.cn> - 18.1.8-2
+* Fri Jul 5 2024 liyunfei <liyunfei33@huawei.com> - 17.0.6-2
-- riscv64: fix unpackaged libomptarget.so.18
-
-* Fri Dec 6 2024 liyunfei <liyunfei33@huawei.com> - 18.1.8-1
-- init for Multi-Version LLVM-18.1.8
-
-* Sun Nov 10 2024 Funda Wang <fundawang@yeah.net> - 17.0.6-5
-- adopt to new cmake macro
-
-* Tue Aug 20 2024 liyunfei <liyunfei33@huawei.com> - 17.0.6-4
-- Add BiSheng Autotuner support.
-
-* Fri Jul 5 2024 liyunfei <liyunfei33@huawei.com> - 17.0.6-3
 - Add toolchain_clang build support
 
-* Wed Jun 05 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 17.0.6-2
-- fix build error for loongarch64
-
 * Mon Dec 4 2023 zhoujing <zhoujing106@huawei.com> - 17.0.6-1
 - Update to 17.0.6
 

openmp.yaml

@@ -1,4 +0,0 @@
-version_control: github
-src_repo: llvm/llvm-project
-tag_prefix: ^llvmorg-
-separator: .