diff --git a/0001-Modify-python-to-python3-with-configure.py.patch b/0001-Modify-python-to-python3-with-configure.py.patch deleted file mode 100644 index c680afb4a3382f5e02c699cb06230403b4f03221..0000000000000000000000000000000000000000 --- a/0001-Modify-python-to-python3-with-configure.py.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a65d47ab65015fd4ffe75125853cee80b04dbbff Mon Sep 17 00:00:00 2001 -From: lyn1001 -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 - diff --git a/libclc-12.0.1.src.tar.xz b/libclc-12.0.1.src.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..66a01e87760391bdb098ab03f01a870fb508057e Binary files /dev/null and b/libclc-12.0.1.src.tar.xz differ diff --git a/libclc-git1ecb16d.tar.gz b/libclc-git1ecb16d.tar.gz deleted file mode 100644 index 209e37daf3e94faa38384a2096b54b776aeefe76..0000000000000000000000000000000000000000 Binary files a/libclc-git1ecb16d.tar.gz and /dev/null differ diff --git a/libclc.spec b/libclc.spec index 81729ea06c9d83eefe83eb37ae1ccae1a6dad14e..0ab8c071ad91c21cfb7248849e94f52ad61fcd80 100644 --- a/libclc.spec +++ b/libclc.spec @@ -1,15 +1,15 @@ %global debug_package %{nil} Name: libclc -Version: 0.2.0 -Release: 16 +Version: 12.0.1 +Release: 1 Summary: An implementation of the library requirements of the OpenCL C License: BSD URL: https://libclc.llvm.org -Source0: https://github.com/llvm-mirror/%{name}/archive/1ecb16dd7d8b8e9151027faab996f27b2ac508e3/%{name}-git1ecb16d.tar.gz -Patch0001: 0001-Modify-python-to-python3-with-configure.py.patch +Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{name}-%{version}.src.tar.xz ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 riscv64 BuildRequires: clang-devel libedit-devel llvm-devel >= 3.9 python3 zlib-devel +BuildRequires: cmake spirv-llvm-translator-tools %description 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. %prep -%autosetup -n %{name}-1ecb16dd7d8b8e9151027faab996f27b2ac508e3 -p1 +%autosetup -n %{name}-%{version}.src -p1 %build export CFLAGS="%{build_cflags} -D__extern_always_inline=inline" %set_build_flags -./configure.py --prefix=%{_prefix} --libexecdir=%{_libdir}/clc/ --pkgconfigdir=%{_libdir}/pkgconfig/ +%cmake -DCMAKE_INSTALL_DATADIR:PATH=%{_libdir} %make_build %install %make_install +%check +make test + %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 %files devel %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Mar 18 2022 yaoxin - 12.0.1-1 +- Upgrade libclc to 12.0.1 to resolve compilation failures. + * Tue Aug 11 2020 yanan li -0.2.0-16 - Modify python to python3