From 48d28f85ca76e27283e4d7d0530ac67fba81af14f5f77608f0ff7cd7ffd2f618 Mon Sep 17 00:00:00 2001 From: Martin Hauke Date: Fri, 26 Jun 2020 11:13:25 +0000 Subject: [PATCH] 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 --- pocl.changes | 5 +++++ pocl.spec | 14 +++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pocl.changes b/pocl.changes index b2fdccf..bc5b22b 100644 --- a/pocl.changes +++ b/pocl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 26 11:05:12 UTC 2020 - Stefan Dirsch + +- moved pocl.icd to /usr/share/OpenCL/vendors for real ... + ------------------------------------------------------------------- Thu Jun 25 09:53:25 UTC 2020 - Stefan Dirsch diff --git a/pocl.spec b/pocl.spec index cd2b1b8..72628db 100644 --- a/pocl.spec +++ b/pocl.spec @@ -17,10 +17,6 @@ # -%if 0%{?suse_version} <= 1550 -%define _distconfdir /etc -%endif - %define sover 2.5.0 Name: pocl Version: 1.5 @@ -98,7 +94,7 @@ This subpackage provides the development files needed for pocl. %cmake \ -DENABLE_CUDA=0 \ -DENABLE_ICD=ON \ - -DPOCL_INSTALL_ICD_VENDORDIR=%{_distconfdir}/OpenCL/vendors \ + -DPOCL_INSTALL_ICD_VENDORDIR=%{_datadir}/OpenCL/vendors \ %ifarch %{ix86} x86_64 -DKERNELLIB_HOST_CPU_VARIANTS=distro \ %endif @@ -119,7 +115,7 @@ sed -i 's/-Wl,--no-undefined//g' build.ninja %cmake_install # FIXME - should be handled upstream 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 #rm -vf %%{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 %doc CHANGES README doc/sphinx/source/*.rst %license LICENSE -%dir %{_distconfdir}/OpenCL/ -%dir %{_distconfdir}/OpenCL/vendors -%{_distconfdir}/OpenCL/vendors/pocl.icd +%dir %{_datadir}/OpenCL/ +%dir %{_datadir}/OpenCL/vendors +%{_datadir}/OpenCL/vendors/pocl.icd %{_bindir}/poclcc %dir %{_libdir}/pocl/ %{_libdir}/pocl/libllvmopencl.so