diff --git a/README.en.md b/README.en.md index 3046be66efa41f0a8b78b8baafb01cb0a7332388..8b3ee3ede8363ad1f807b5e06ae777ecb484ac3d 100644 --- a/README.en.md +++ b/README.en.md @@ -1,22 +1,7 @@ # libclc #### Description -{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx +The libclc project aims to implement the OpenCL standard library. #### Contribution diff --git a/README.md b/README.md index 6763e989f0dc7508d1e59cd596f591e11a6569b6..0c77f5e5d205fbda6ab1c4299caa468c710c03ab 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,7 @@ # libclc #### 介绍 -{**以下是码云平台说明，您可以替换此简介** -码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx +The libclc project aims to implement the OpenCL standard library. #### 参与贡献 diff --git a/libclc-15.0.7.src.tar.xz b/libclc-15.0.7.src.tar.xz deleted file mode 100644 index 591e136ed2c000bcdeab15635222dbcb7e6b685f..0000000000000000000000000000000000000000 Binary files a/libclc-15.0.7.src.tar.xz and /dev/null differ diff --git a/libclc-15.0.7.src.tar.xz.sig b/libclc-15.0.7.src.tar.xz.sig deleted file mode 100644 index 4cff2f0172836613cef56ce5d77f2e4b7f050db6..0000000000000000000000000000000000000000 Binary files a/libclc-15.0.7.src.tar.xz.sig and /dev/null differ diff --git a/libclc-17.0.6.src.tar.xz b/libclc-17.0.6.src.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..69bfe0fc31d474e6e3a959a9e94791d88282496e Binary files /dev/null and b/libclc-17.0.6.src.tar.xz differ diff --git a/libclc.spec b/libclc.spec index 986339d7ad60acffcec622144f2d338df6a16b4f..b6af9c43fdd021628a50bcb65dd21e34ebf35bda 100644 --- a/libclc.spec +++ b/libclc.spec @@ -1,32 +1,52 @@ %bcond_without check +%bcond_without sys_llvm -%global maj_ver 15 +%global maj_ver 17 %global min_ver 0 -%global patch_ver 7 +%global patch_ver 6 %global clc_version %{maj_ver}.%{min_ver}.%{patch_ver} -%global clc_srcdir libclc-%{version}%{?rc_ver:rc%{rc_ver}}.src +%global clc_srcdir libclc-%{clc_version}.src %global debug_package %{nil} -Name: libclc +%if %{with sys_llvm} +%global pkg_name libclc +%global install_prefix %{_prefix} +%else +%global pkg_name libclc%{maj_ver} +%global install_prefix %{_libdir}/llvm%{maj_ver} +%endif + +%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 + +Name: %{pkg_name} Version: %{clc_version} -Release: 2 +Release: 1 Summary: An implementation of the library requirements of the OpenCL C -License: BSD +License: Apache-2.0 WITH LLVM-exception OR BSD OR MIT URL: https://libclc.llvm.org Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{clc_srcdir}.tar.xz -Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{clc_srcdir}.tar.xz.sig + ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 riscv64 loongarch64 -BuildRequires: gcc gcc-c++ BuildRequires: clang -BuildRequires: libedit-devel -BuildRequires: llvm-devel >= 3.9 +BuildRequires: clang-devel >= %{version} +BuildRequires: libedit-devel +%if %{with sys_llvm} +BuildRequires: llvm-devel = %{version} +%else +BuildRequires: llvm%{maj_ver}-devel = %{version} +%endif BuildRequires: python3 BuildRequires: zlib-devel BuildRequires: cmake BuildRequires: spirv-llvm-translator-tools %description -bclc is an open source, BSD/MIT dual licensed implementation of the +libclc is an open source, BSD/MIT dual licensed implementation of the library requirements of the OpenCL C programming language, as specified by the OpenCL 1.1 Specification. The following sections of the specification impose library requirements: @@ -65,7 +85,7 @@ developing applications that use libclc. %build export CFLAGS="%{build_cflags} -D__extern_always_inline=inline" %set_build_flags -%cmake -DCMAKE_INSTALL_DATADIR:PATH=%{_libdir} +%cmake -DCMAKE_INSTALL_DATADIR:PATH=%{install_libdir} %make_build @@ -82,20 +102,24 @@ make test || true %files %license LICENSE.TXT %doc README.TXT CREDITS.TXT -%dir %{_libdir}/clc -%{_libdir}/clc/*.bc -%{_libdir}/clc/spirv-mesa3d-.spv -%{_libdir}/clc/spirv64-mesa3d-.spv -%{_includedir}/clc +%dir %{install_libdir}/clc +%{install_libdir}/clc/*.bc +%{install_libdir}/clc/spirv-mesa3d-.spv +%{install_libdir}/clc/spirv64-mesa3d-.spv +%{install_includedir}/clc %files devel -%{_libdir}/pkgconfig/%{name}.pc +%{install_libdir}/pkgconfig/%{name}.pc +%{install_includedir}/clc %changelog -* Sat Aug 05 2023 cf-zhao 15.0.7-2 +* Mon Dec 4 2023 zhoujing - 17.0.6-1 +- Update to 17.0.6 + +* Sat Aug 05 2023 cf-zhao - 15.0.7-2 - Disable check temporarily due to two failed cases -* Fri Jun 23 2023 cf-zhao 15.0.7-1 +* Fri Jun 23 2023 cf-zhao - 15.0.7-1 - Update to 15.0.7 * Thu Feb 16 2023 Wenlong Zhang - 12.0.1-2