Date: Friday, March 17, 2023 @ 07:52:45
  Author: tpkessler
Revision: 1421234

upgpkg: intel-oneapi-compiler-shared-runtime 2023.0.0-6: Fix dependencies for 
OpenCL package

Modified:
  intel-oneapi-compiler-shared-runtime/trunk/PKGBUILD

----------+
 PKGBUILD |   68 +++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 40 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-03-17 07:30:51 UTC (rev 1421233)
+++ PKGBUILD    2023-03-17 07:52:45 UTC (rev 1421234)
@@ -6,7 +6,7 @@
 pkgname=("${_pkgname}-runtime" "${_pkgname}-runtime-libs" 
"${_pkgname}-opencl-cpu")
 pkgver=2023.0.0
 _debpkgrel=25370
-pkgrel=5
+pkgrel=6
 _pkgdesc="Intel oneAPI compiler runtime libraries"
 arch=('x86_64')
 url='https://software.intel.com/content/www/us/en/develop/tools/oneapi.html'
@@ -32,7 +32,7 @@
 }
 
 package_intel-oneapi-compiler-shared-runtime-libs() {
-    depends=('intel-oneapi-openmp' 'intel-oneapi-common')
+    depends=('intel-oneapi-common')
     conflicts=('intel-oneapi-basekit')
     pkgdesc="${_pkgdesc}: Minimal compiler libraries"
 
@@ -53,42 +53,38 @@
     local _ldso_conf="${pkgdir}"/etc/ld.so.conf.d
     install -d "${_ldso_conf}"
     echo "${_lib_path}/latest/linux/compiler/lib/intel64_lin" >> 
"${_ldso_conf}/${pkgname}.conf"
+
+    install -d "${pkgdir}"/usr/share/licenses/"${pkgname}"
+    ln -s /usr/share/licenses/intel-oneapi 
"${pkgdir}"/usr/share/licenses/"${pkgname}"/oneapi
 }
 
-package_intel-oneapi-compiler-shared-runtime() {
-    depends=('intel-oneapi-openmp' 'intel-oneapi-common' 
'intel-oneapi-compiler-shared-runtime-libs')
-    provides=("${_pkgname}-common")
+package_intel-oneapi-compiler-shared-opencl-cpu() {
+    depends=('intel-oneapi-openmp' 'intel-oneapi-compiler-shared-runtime-libs'
+        'opencl-headers' 'opencl-icd-loader') 
     conflicts=('intel-oneapi-basekit')
-    pkgdesc="${_pkgdesc}: Shared runtime without OpenCL"
+    pkgdesc="${_pkgdesc}: OpenCL CPU runtime"
 
     local _lib_path='/opt/intel/oneapi/compiler'
-    install -d "${pkgdir}/${_lib_path}/${pkgver}/linux"
-    cp -a 
"${srcdir}/${_pkgname}-${pkgver}/${_lib_path}/${pkgver}/linux/bin-llvm" \
-        "${pkgdir}/${_lib_path}/${pkgver}/linux"
-
-    cp -a 
"${srcdir}/${_pkgname}-${pkgver}/${_lib_path}/${pkgver}/linux/include" \
-        "${pkgdir}/${_lib_path}/${pkgver}/linux"
-
     install -d "${pkgdir}/${_lib_path}/${pkgver}/linux/bin"
     local _bin
-    for _bin in aocl-ioc64 icx-cc icx-cl icx.cfg ioc64; do
+    for _bin in sycl-ls sycl-post-link; do
         cp -a 
"${srcdir}/${_pkgname}-${pkgver}/${_lib_path}/${pkgver}/linux/bin/${_bin}" \
             "${pkgdir}/${_lib_path}/${pkgver}/linux/bin"
     done
 
+    install -d "${pkgdir}/${_lib_path}/${pkgver}/linux/lib"
     local _lib
-    install -d "${pkgdir}/${_lib_path}/${pkgver}/linux/lib"
     cd "${srcdir}/${_pkgname}-${pkgver}/${_lib_path}/${pkgver}/linux/lib"
-    for _lib in clbltfnshared.rtl icx-lto.so libcm.so libigfxcmrt_emu.so 
libshim.so libshim_l0.so libxpti.a libxptifw.so libsycl-*; do
+    for _lib in libOpenCL.so* libpi_esimd_emulator.so libpi_opencl.so; do
         cp -a "${_lib}" "${pkgdir}/${_lib_path}/${pkgver}/linux/lib"
     done
 
     install -d "${pkgdir}/${_lib_path}/${pkgver}/linux/lib/x64"
     cd "${srcdir}/${_pkgname}-${pkgver}/${_lib_path}/${pkgver}/linux/lib/x64"
-    for _lib in libclang_compiler* libcommon_clang* libtask_executor*; do
+    for _lib in __ocl_svml* cl*.rtl cllibrary*.o libOclCpuBackEnd* 
libcl_logger* libcpu_device* libintelocl*; do
         cp -a "${_lib}" "${pkgdir}/${_lib_path}/${pkgver}/linux/lib/x64"
     done
-    
+
     # allow libs to be found
     local _ldso_conf="${pkgdir}"/etc/ld.so.conf.d
     install -d "${_ldso_conf}"
@@ -95,39 +91,55 @@
     echo "${_lib_path}/latest/linux/lib" > "${_ldso_conf}/${pkgname}.conf"
     echo "${_lib_path}/latest/linux/lib/x64" >> "${_ldso_conf}/${pkgname}.conf"
 
+    echo "/opt/intel/oneapi/compiler/${pkgver}/linux/lib/libOpenCL.so" > 
"${pkgname}.icd"
+    install -Dm644 "${pkgname}.icd" "$pkgdir/etc/OpenCL/vendors/${pkgname}.icd"
+
     install -d "${pkgdir}"/usr/share/licenses/"${pkgname}"
     ln -s /usr/share/licenses/intel-oneapi 
"${pkgdir}"/usr/share/licenses/"${pkgname}"/oneapi
 }
 
-package_intel-oneapi-compiler-shared-opencl-cpu() {
-    depends=('intel-oneapi-compiler-shared-runtime' 'opencl-headers' 
'opencl-icd-loader') 
+package_intel-oneapi-compiler-shared-runtime() {
+    depends=('intel-oneapi-openmp' 'intel-oneapi-common'
+        'intel-oneapi-compiler-shared-runtime-libs' 
'intel-oneapi-compiler-shared-opencl-cpu')
+    provides=("${_pkgname}-common")
     conflicts=('intel-oneapi-basekit')
-    pkgdesc="${_pkgdesc}: OpenCL CPU runtime"
+    pkgdesc="${_pkgdesc}: Shared runtime without OpenCL"
 
     local _lib_path='/opt/intel/oneapi/compiler'
+    install -d "${pkgdir}/${_lib_path}/${pkgver}/linux"
+    cp -a 
"${srcdir}/${_pkgname}-${pkgver}/${_lib_path}/${pkgver}/linux/bin-llvm" \
+        "${pkgdir}/${_lib_path}/${pkgver}/linux"
+
+    cp -a 
"${srcdir}/${_pkgname}-${pkgver}/${_lib_path}/${pkgver}/linux/include" \
+        "${pkgdir}/${_lib_path}/${pkgver}/linux"
+
     install -d "${pkgdir}/${_lib_path}/${pkgver}/linux/bin"
     local _bin
-    for _bin in sycl-ls sycl-post-link; do
+    for _bin in aocl-ioc64 icx-cc icx-cl icx.cfg ioc64; do
         cp -a 
"${srcdir}/${_pkgname}-${pkgver}/${_lib_path}/${pkgver}/linux/bin/${_bin}" \
             "${pkgdir}/${_lib_path}/${pkgver}/linux/bin"
     done
 
+    local _lib
     install -d "${pkgdir}/${_lib_path}/${pkgver}/linux/lib"
-    local _lib
     cd "${srcdir}/${_pkgname}-${pkgver}/${_lib_path}/${pkgver}/linux/lib"
-    for _lib in libOpenCL.so* libpi_esimd_emulator.so libpi_opencl.so; do
+    for _lib in clbltfnshared.rtl icx-lto.so libcm.so libigfxcmrt_emu.so 
libshim.so libshim_l0.so libxpti.a libxptifw.so libsycl-*; do
         cp -a "${_lib}" "${pkgdir}/${_lib_path}/${pkgver}/linux/lib"
     done
 
     install -d "${pkgdir}/${_lib_path}/${pkgver}/linux/lib/x64"
     cd "${srcdir}/${_pkgname}-${pkgver}/${_lib_path}/${pkgver}/linux/lib/x64"
-    for _lib in __ocl_svml* cl*.rtl cllibrary*.o libOclCpuBackEnd* 
libcl_logger* libcpu_device* libintelocl*; do
+    for _lib in libclang_compiler* libcommon_clang* libtask_executor*; do
         cp -a "${_lib}" "${pkgdir}/${_lib_path}/${pkgver}/linux/lib/x64"
     done
+    
+    # allow libs to be found
+    local _ldso_conf="${pkgdir}"/etc/ld.so.conf.d
+    install -d "${_ldso_conf}"
+    echo "${_lib_path}/latest/linux/lib" > "${_ldso_conf}/${pkgname}.conf"
+    echo "${_lib_path}/latest/linux/lib/x64" >> "${_ldso_conf}/${pkgname}.conf"
 
-    echo "/opt/intel/oneapi/compiler/${pkgver}/linux/lib/libOpenCL.so" > 
"${pkgname}.icd"
-    install -Dm644 "${pkgname}.icd" "$pkgdir/etc/OpenCL/vendors/${pkgname}.icd"
-
     install -d "${pkgdir}"/usr/share/licenses/"${pkgname}"
     ln -s /usr/share/licenses/intel-oneapi 
"${pkgdir}"/usr/share/licenses/"${pkgname}"/oneapi
 }
+

Reply via email to