Upgrade libclc to 12.0.1 to resolve compilation failures.
(cherry picked from commit e051d5c1add029966927ccaf7c5ef69e8c2d4ff1)
This commit is contained in:
parent
3d4e1adff5
commit
2926473df0
@ -1,32 +0,0 @@
|
|||||||
From a65d47ab65015fd4ffe75125853cee80b04dbbff Mon Sep 17 00:00:00 2001
|
|
||||||
From: lyn1001 <thistleslyn@163.com>
|
|
||||||
Date: Tue, 11 Aug 2020 13:59:21 +0800
|
|
||||||
Subject: [PATCH] Modify python to python3 with configure.py
|
|
||||||
|
|
||||||
---
|
|
||||||
.../configure.py | 4 ++--
|
|
||||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/configure.py b/configure.py
|
|
||||||
index dab5dc9..6663645 100755
|
|
||||||
--- a/configure.py
|
|
||||||
+++ b/configure.py
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-#!/usr/bin/python
|
|
||||||
+#!/usr/bin/python3
|
|
||||||
from __future__ import print_function
|
|
||||||
|
|
||||||
def c_compiler_rule(b, name, description, compiler, flags):
|
|
||||||
@@ -151,7 +151,7 @@ b.build(prepare_builtins, "LLVM_TOOL_LINK",
|
|
||||||
|
|
||||||
b.rule("PREPARE_BUILTINS", "%s -o $out $in" % prepare_builtins,
|
|
||||||
'PREPARE-BUILTINS $out')
|
|
||||||
-b.rule("PYTHON_GEN", "python < $in > $out", "PYTHON_GEN $out")
|
|
||||||
+b.rule("PYTHON_GEN", "python3 < $in > $out", "PYTHON_GEN $out")
|
|
||||||
b.build('generic/lib/convert.cl', "PYTHON_GEN", ['generic/lib/gen_convert.py'])
|
|
||||||
|
|
||||||
manifest_deps = set([sys.argv[0], os.path.join(srcdir, 'build', 'metabuild.py'),
|
|
||||||
|
|
||||||
--
|
|
||||||
2.23.0
|
|
||||||
|
|
||||||
BIN
libclc-12.0.1.src.tar.xz
Normal file
BIN
libclc-12.0.1.src.tar.xz
Normal file
Binary file not shown.
Binary file not shown.
20
libclc.spec
20
libclc.spec
@ -1,15 +1,15 @@
|
|||||||
%global debug_package %{nil}
|
%global debug_package %{nil}
|
||||||
|
|
||||||
Name: libclc
|
Name: libclc
|
||||||
Version: 0.2.0
|
Version: 12.0.1
|
||||||
Release: 16
|
Release: 1
|
||||||
Summary: An implementation of the library requirements of the OpenCL C
|
Summary: An implementation of the library requirements of the OpenCL C
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: https://libclc.llvm.org
|
URL: https://libclc.llvm.org
|
||||||
Source0: https://github.com/llvm-mirror/%{name}/archive/1ecb16dd7d8b8e9151027faab996f27b2ac508e3/%{name}-git1ecb16d.tar.gz
|
Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{name}-%{version}.src.tar.xz
|
||||||
Patch0001: 0001-Modify-python-to-python3-with-configure.py.patch
|
|
||||||
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 riscv64
|
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 riscv64
|
||||||
BuildRequires: clang-devel libedit-devel llvm-devel >= 3.9 python3 zlib-devel
|
BuildRequires: clang-devel libedit-devel llvm-devel >= 3.9 python3 zlib-devel
|
||||||
|
BuildRequires: cmake spirv-llvm-translator-tools
|
||||||
|
|
||||||
%description
|
%description
|
||||||
bclc is an open source, BSD/MIT dual licensed implementation of the
|
bclc is an open source, BSD/MIT dual licensed implementation of the
|
||||||
@ -46,29 +46,37 @@ The libclc-devel package contains libraries and header files for
|
|||||||
developing applications that use libclc.
|
developing applications that use libclc.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-1ecb16dd7d8b8e9151027faab996f27b2ac508e3 -p1
|
%autosetup -n %{name}-%{version}.src -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CFLAGS="%{build_cflags} -D__extern_always_inline=inline"
|
export CFLAGS="%{build_cflags} -D__extern_always_inline=inline"
|
||||||
%set_build_flags
|
%set_build_flags
|
||||||
./configure.py --prefix=%{_prefix} --libexecdir=%{_libdir}/clc/ --pkgconfigdir=%{_libdir}/pkgconfig/
|
%cmake -DCMAKE_INSTALL_DATADIR:PATH=%{_libdir}
|
||||||
|
|
||||||
%make_build
|
%make_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install
|
%make_install
|
||||||
|
|
||||||
|
%check
|
||||||
|
make test
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license LICENSE.TXT
|
%license LICENSE.TXT
|
||||||
%doc README.TXT CREDITS.TXT
|
%doc README.TXT CREDITS.TXT
|
||||||
%dir %{_libdir}/clc
|
%dir %{_libdir}/clc
|
||||||
%{_libdir}/clc/*.bc
|
%{_libdir}/clc/*.bc
|
||||||
|
%{_libdir}/clc/spirv-mesa3d-.spv
|
||||||
|
%{_libdir}/clc/spirv64-mesa3d-.spv
|
||||||
%{_includedir}/clc
|
%{_includedir}/clc
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%{_libdir}/pkgconfig/%{name}.pc
|
%{_libdir}/pkgconfig/%{name}.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Mar 18 2022 yaoxin <yaoxin30@huawei.com> - 12.0.1-1
|
||||||
|
- Upgrade libclc to 12.0.1 to resolve compilation failures.
|
||||||
|
|
||||||
* Tue Aug 11 2020 yanan li <liyanan032@huawei.com> -0.2.0-16
|
* Tue Aug 11 2020 yanan li <liyanan032@huawei.com> -0.2.0-16
|
||||||
- Modify python to python3
|
- Modify python to python3
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user