[arch-commits] Commit in intel-oneapi-tbb/trunk (PKGBUILD)

[Konstantin Gizdov]

    Date: Friday, August 26, 2022 @ 22:57:15
  Author: kgizdov
Revision: 1284538

upgpkg: intel-oneapi-tbb 2021.6.0-4: fix packaging, pkgconfig and symlinks

Modified:
  intel-oneapi-tbb/trunk/PKGBUILD

----------+
 PKGBUILD |   39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-26 22:49:53 UTC (rev 1284537)
+++ PKGBUILD	2022-08-26 22:57:15 UTC (rev 1284538)
@@ -3,7 +3,7 @@
 pkgname=intel-oneapi-tbb
 pkgver=2021.6.0
 _debpkgrel='835'
-pkgrel=3
+pkgrel=4
 pkgdesc="Intel oneAPI Threading Building Blocks"
 arch=('x86_64')
 url='https://software.intel.com/content/www/us/en/develop/tools/oneapi.html'
@@ -17,6 +17,7 @@
         '19a26fe2ca09190e5144e331ad89d1b0136a3c8dc235397d64edfca9b5390203dca5b83d93690acf3064d659c3c6b5869251a717a04f103c8d29ce44264ca5df'
         '74bfe7cbe979cf1f2610129c995d6f90a739383ee7ad0e9c6021ad3c4d3ed40e87a0f9cbe0aa0299bc388bdec2b400b336d4813ede20aaec27aa55033c55a756')
 depends=('intel-oneapi-common')
+conflicts=('intel-oneapi-basekit')
 noextract=(
     "${pkgname}-${pkgver}-${pkgver}-${_debpkgrel}_amd64.deb"
     "${pkgname}-devel-${pkgver}-${pkgver}-${_debpkgrel}_amd64.deb"
@@ -23,33 +24,28 @@
     "${pkgname}-common-${pkgver}-${pkgver}-${_debpkgrel}_all.deb"
     "${pkgname}-common-devel-${pkgver}-${pkgver}-${_debpkgrel}_all.deb"
 )
-build() {
+
+package() {
     cd "${srcdir}"
-    mkdir tbb tbbdev common commondev package
-
-    cd "${srcdir}"/tbb
     ar x "${srcdir}/${pkgname}-${pkgver}-${pkgver}-${_debpkgrel}_amd64.deb"
-    tar xvf data.tar.xz -C "${srcdir}"/package
+    tar xvf data.tar.xz -C "${pkgdir}"
+    rm data.tar.xz
 
-    cd "${srcdir}"/tbbdev
     ar x "${srcdir}/${pkgname}-devel-${pkgver}-${pkgver}-${_debpkgrel}_amd64.deb"
-    tar xvf data.tar.xz -C "${srcdir}"/package
+    tar xvf data.tar.xz -C "${pkgdir}"
+    rm data.tar.xz
 
-    cd "${srcdir}"/common
     ar x "${srcdir}/${pkgname}-common-${pkgver}-${pkgver}-${_debpkgrel}_all.deb"
-    tar xvf data.tar.xz -C "${srcdir}"/package
+    tar xvf data.tar.xz -C "${pkgdir}"
+    rm data.tar.xz
 
-    cd "${srcdir}"/commondev
     ar x "${srcdir}/${pkgname}-common-devel-${pkgver}-${pkgver}-${_debpkgrel}_all.deb"
-    tar xvf data.tar.xz -C "${srcdir}"/package
+    tar xvf data.tar.xz -C "${pkgdir}"
+    rm data.tar.xz
 
     # drop conda binaries
-    rm -r "${srcdir}"/package/opt/intel/oneapi/conda_channel
-}
+    rm -r "${pkgdir}"/opt/intel/oneapi/conda_channel
 
-package() {
-    mv "${srcdir}"/package/opt "${pkgdir}"
-
     # latest symlink
     local _prefix=/opt/intel/oneapi/tbb
     ln -s "${_prefix}/${pkgver}" "${pkgdir}/${_prefix}/latest"
@@ -57,14 +53,13 @@
     # fix pkgconfig
     sed "s at prefix=.*@prefix=${_prefix}/latest at g" \
         -i "${pkgdir}/${_prefix}/${pkgver}"/lib/pkgconfig/tbb.pc
-    mv "${pkgdir}/${_prefix}/${pkgver}"/lib/pkgconfig/{,'oneapi-'}tbb.pc
-    install -d "${pkgdir}"/usr/lib/pkgconfig
-    ln -s "${_prefix}"/latest/lib/pkgconfig/oneapi-tbb.pc "${pkgdir}"/usr/lib/pkgconfig/oneapi-tbb.pc
+    install -d "${pkgdir}"/usr/share/pkgconfig
+    ln -s "${_prefix}"/latest/lib/pkgconfig/tbb.pc "${pkgdir}"/usr/share/pkgconfig/tbb.pc
 
     # ldconfig
     install -d "${pkgdir}"/etc/ld.so.conf.d
-    echo "${_prefix}"/latest/"$(sed -n 's/libdir=${prefix}\///p' "${pkgdir}/${_prefix}/${pkgver}"/lib/pkgconfig/oneapi-tbb.pc)" \
-        > "${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf" 
+    echo "${_prefix}"/latest/"$(sed -n 's/libdir=${prefix}\///p' "${pkgdir}/${_prefix}/${pkgver}"/lib/pkgconfig/tbb.pc)" \
+        > "${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
 
     install -d "${pkgdir}"/usr/share/licenses/"${pkgname}"
     ln -s /usr/share/licenses/intel-oneapi "${pkgdir}"/usr/share/licenses/"${pkgname}"/oneapi