Accepting request 817237 from home:sndirsch:branches:science

- moved pocl.icd to /usr/share/OpenCL/vendors for real ...

OBS-URL: https://build.opensuse.org/request/show/817237
OBS-URL: https://build.opensuse.org/package/show/science/pocl?expand=0&rev=54
This commit is contained in:
Martin Hauke 2020-06-26 11:13:25 +00:00 committed by Git OBS Bridge
parent 79574b5fae
commit 48d28f85ca
2 changed files with 10 additions and 9 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jun 26 11:05:12 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
- moved pocl.icd to /usr/share/OpenCL/vendors for real ...
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 25 09:53:25 UTC 2020 - Stefan Dirsch <sndirsch@suse.com> Thu Jun 25 09:53:25 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>

View File

@ -17,10 +17,6 @@
# #
%if 0%{?suse_version} <= 1550
%define _distconfdir /etc
%endif
%define sover 2.5.0 %define sover 2.5.0
Name: pocl Name: pocl
Version: 1.5 Version: 1.5
@ -98,7 +94,7 @@ This subpackage provides the development files needed for pocl.
%cmake \ %cmake \
-DENABLE_CUDA=0 \ -DENABLE_CUDA=0 \
-DENABLE_ICD=ON \ -DENABLE_ICD=ON \
-DPOCL_INSTALL_ICD_VENDORDIR=%{_distconfdir}/OpenCL/vendors \ -DPOCL_INSTALL_ICD_VENDORDIR=%{_datadir}/OpenCL/vendors \
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
-DKERNELLIB_HOST_CPU_VARIANTS=distro \ -DKERNELLIB_HOST_CPU_VARIANTS=distro \
%endif %endif
@ -119,7 +115,7 @@ sed -i 's/-Wl,--no-undefined//g' build.ninja
%cmake_install %cmake_install
# FIXME - should be handled upstream # FIXME - should be handled upstream
mv %{buildroot}%{_prefix}%{_libdir} %{buildroot}%{_libdir} mv %{buildroot}%{_prefix}%{_libdir} %{buildroot}%{_libdir}
sed -i 's|%{_prefix}%{_prefix}/|%{_prefix}/|g' %{buildroot}%{_distconfdir}/OpenCL/vendors/pocl.icd sed -i 's|%{_prefix}%{_prefix}/|%{_prefix}/|g' %{buildroot}%{_datadir}/OpenCL/vendors/pocl.icd
# Unbundle vecmath # Unbundle vecmath
#rm -vf %%{buildroot}/%%{_libdir}/pocl/vecmath/ #rm -vf %%{buildroot}/%%{_libdir}/pocl/vecmath/
#ln -vs %%{_includedir}/vecmath %%{buildroot}/%%{_libdir}/pocl/vecmath #ln -vs %%{_includedir}/vecmath %%{buildroot}/%%{_libdir}/pocl/vecmath
@ -131,9 +127,9 @@ sed -i 's|%{_prefix}%{_prefix}/|%{_prefix}/|g' %{buildroot}%{_distconfdir}/OpenC
%files %files
%doc CHANGES README doc/sphinx/source/*.rst %doc CHANGES README doc/sphinx/source/*.rst
%license LICENSE %license LICENSE
%dir %{_distconfdir}/OpenCL/ %dir %{_datadir}/OpenCL/
%dir %{_distconfdir}/OpenCL/vendors %dir %{_datadir}/OpenCL/vendors
%{_distconfdir}/OpenCL/vendors/pocl.icd %{_datadir}/OpenCL/vendors/pocl.icd
%{_bindir}/poclcc %{_bindir}/poclcc
%dir %{_libdir}/pocl/ %dir %{_libdir}/pocl/
%{_libdir}/pocl/libllvmopencl.so %{_libdir}/pocl/libllvmopencl.so