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

[Konstantin Gizdov]

    Date: Friday, August 26, 2022 @ 14:14:59
  Author: kgizdov
Revision: 1282524

upgpkg: intel-oneapi-openmp 2022.1.0-7: include runtime libs and update pkgconfig

Modified:
  intel-oneapi-openmp/trunk/PKGBUILD

----------+
 PKGBUILD |   65 +++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 44 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-26 14:14:58 UTC (rev 1282523)
+++ PKGBUILD	2022-08-26 14:14:59 UTC (rev 1282524)
@@ -3,38 +3,59 @@
 pkgname=intel-oneapi-openmp
 pkgver=2022.1.0
 _debpkgrel='3768'
-pkgrel=6
+pkgrel=7
 pkgdesc="Intel oneAPI OpenMP runtime library"
 arch=('x86_64')
 url='https://software.intel.com/content/www/us/en/develop/tools/oneapi.html'
 license=("custom")
-source=("https://apt.repos.intel.com/oneapi/pool/main/${pkgname}-${pkgver}-${pkgver}-${_debpkgrel}_amd64.deb"
-        "https://apt.repos.intel.com/oneapi/pool/main/${pkgname}-common-${pkgver}-${pkgver}-${_debpkgrel}_all.deb")
-b2sums=('4bc045f0d1288f19c76ddc985673661335d9e72be5aee4de0d79241d32db8c7889a097aa33f0a613f774e37b04b0b0d916fd0789efca04e41521f935c3b71e9b'
-        '2540d20e5da610f4cfea0632920c81e270704a316af5831e13c17bc31aab8687ed35708c7342270a76a0b456070323ad054f989e78968f5460166b23fed46cbc')
-depends=('intel-oneapi-common' 'libelf')
+source=("https://apt.repos.intel.com/oneapi/pool/main/${pkgname}-${pkgver}-${_debpkgrel}_amd64.deb"
+        "https://apt.repos.intel.com/oneapi/pool/main/${pkgname}-${pkgver}-${pkgver}-${_debpkgrel}_amd64.deb"
+        "https://apt.repos.intel.com/oneapi/pool/main/${pkgname}-common-${pkgver}-${pkgver}-${_debpkgrel}_all.deb"
+        "https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-openmp-${pkgver}-${_debpkgrel}_amd64.deb"
+        "https://apt.repos.intel.com/oneapi/pool/main/intel-oneapi-runtime-openmp-common-${pkgver}-${_debpkgrel}_all.deb")
+b2sums=('d2c2be07806952a8b5af3c5efb24b1577e2ca8fbdaef29c8774ba486a60cbc4bd5c43a2ab26b96499eed60e1f4bacf355f0a015149681f75ec5d9d176493edc2'
+        '4bc045f0d1288f19c76ddc985673661335d9e72be5aee4de0d79241d32db8c7889a097aa33f0a613f774e37b04b0b0d916fd0789efca04e41521f935c3b71e9b'
+        '2540d20e5da610f4cfea0632920c81e270704a316af5831e13c17bc31aab8687ed35708c7342270a76a0b456070323ad054f989e78968f5460166b23fed46cbc'
+        'b621177688228fde5846911d372eeb5dc005fd8c84caa042b2254ceb7de51bbbee6cc2f8de47bc32af1c2dae2e0ae6616d0694b1b3077b4820ca40320e7da3a3'
+        '6b3dcace1a5337d78d3aab486ff6521e5afea807f29fc1c621eaaa87d972fbeaeff916ea6b8eb7601cda1a888f3286f5edb981648d73c17b2bb391c3411def4a')
+depends=('intel-oneapi-common' 'libelf' 'level-zero-loader' 'libffi')
 noextract=(
+    "${pkgname}-${pkgver}-${_debpkgrel}_amd64.deb"
     "${pkgname}-${pkgver}-${pkgver}-${_debpkgrel}_amd64.deb"
     "${pkgname}-common-${pkgver}-${pkgver}-${_debpkgrel}_all.deb"
+    "intel-oneapi-runtime-openmp-${pkgver}-${_debpkgrel}_amd64.deb"
+    "intel-oneapi-runtime-openmp-common-${pkgver}-${_debpkgrel}_all.deb"
 )
-build() {
+conflicts=('intel-oneapi-basekit')
+
+package() {
     cd "${srcdir}"
-    mkdir openmp common package
 
-    cd "${srcdir}"/openmp
+    ar x "${srcdir}/${pkgname}-${pkgver}-${_debpkgrel}_amd64.deb"
+    tar xvf data.tar.xz -C "${pkgdir}"
+    rm data.tar.xz
+
     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}"/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
 
+    ar x "${srcdir}/intel-oneapi-runtime-openmp-${pkgver}-${_debpkgrel}_amd64.deb"
+    tar xvf data.tar.xz -C "${pkgdir}"
+    rm data.tar.xz
+
+    ar x "${srcdir}/intel-oneapi-runtime-openmp-common-${pkgver}-${_debpkgrel}_all.deb"
+    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}"
+    # fix permissions
+    find "${pkgdir}" -type f \( -iname '*.so' -o -iname '*.so.*' \) -exec chmod +x '{}' \;
 
     # latest symlink
     local _prefix=/opt/intel/oneapi/compiler
@@ -41,16 +62,18 @@
     ln -s "${_prefix}/${pkgver}" "${pkgdir}/${_prefix}/latest"
 
     # fix pkgconfig
-    sed "s at prefix=.*@prefix=${_prefix}/latest at g" \
+    sed -e "s at prefix=.*@prefix=${_prefix}/latest at g" \
+        -e "s@/intel64@/intel64_lin at g" \
         -i "${pkgdir}/${_prefix}/${pkgver}"/lib/pkgconfig/openmp.pc
-    mv "${pkgdir}/${_prefix}/${pkgver}"/lib/pkgconfig/{,'oneapi-'}openmp.pc
-    install -d "${pkgdir}"/usr/lib/pkgconfig
-    ln -s {"${_prefix}"/latest/lib/pkgconfig/,"${pkgdir}"/usr/lib/pkgconfig/}oneapi-openmp.pc
+    install -d "${pkgdir}"/usr/share/pkgconfig
+    ln -s {"${_prefix}"/latest/lib/pkgconfig/,"${pkgdir}"/usr/share/pkgconfig/}openmp.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-openmp.pc)" \
+    echo "${_prefix}"/latest/"$(sed -n 's/libdir=${prefix}\///p' "${pkgdir}/${_prefix}/${pkgver}"/lib/pkgconfig/openmp.pc)" \
         > "${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
+    echo "/opt/intel/oneapi/lib/intel64" >> "${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf"
+    echo "${_prefix}/latest/linux/compiler/lib/intel64_lin" >> "${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