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

[Sven-Hendrik Haase]

    Date: Sunday, February 16, 2020 @ 20:39:11
  Author: svenstaro
Revision: 572840

upgpkg: intel-mkl 2020.0.166-3: Install Intel openmp libs

Modified:
  intel-mkl/trunk/PKGBUILD

----------+
 PKGBUILD |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-16 20:38:28 UTC (rev 572839)
+++ PKGBUILD	2020-02-16 20:39:11 UTC (rev 572840)
@@ -5,7 +5,7 @@
 pkgname=intel-mkl
 pkgver=2020.0.166
 _pkgver=${pkgver/%./-/}
-pkgrel=2
+pkgrel=3
 pkgdesc="Intel Math Kernel Library"
 arch=(x86_64)
 url="https://software.intel.com/en-us/mkl"
@@ -27,6 +27,12 @@
 package() {
   cd l_mkl_$pkgver/rpm
 
+  # We'll ship the terrible mklvars.sh file because some users surely expect it.
+  # TODO: This is basically just hard-coded paths anyway. Just ship a static file.
+  # It's a terrible pkg-config replacement by Intel.
+  # install -Dm755 opt/intel/compilers_and_libraries_${pkgver}/linux/mkl/bin/mklvars.sh "${pkgdir}"/usr/bin/mklvars.sh
+  # sed -i "s|<INSTALLDIR>|/opt/intel/mkl|g" "${pkgdir}"/usr/bin/mklvars.sh
+
   mkdir -p "${pkgdir}"/opt/intel/mkl/lib
 
   # Sadly Intel seems to expect a certain structure for MKL
@@ -33,11 +39,11 @@
   # See https://software.intel.com/en-us/mkl-linux-developer-guide-high-level-directory-structure
   # We'll try to follow that as per upstream suggestion.
   cp opt/intel/compilers_and_libraries_${pkgver}/linux/mkl/lib/intel64_lin/*.{a,so} "${pkgdir}"/opt/intel/mkl/lib
+  cp opt/intel/compilers_and_libraries_${pkgver}/linux/compiler/lib/intel64_lin/*.{a,so} "${pkgdir}"/opt/intel/mkl/lib
   cp -r opt/intel/compilers_and_libraries_${pkgver}/linux/mkl/include "${pkgdir}"/opt/intel/mkl/include
   install -Dm644 opt/intel/compilers_and_libraries_${pkgver}/licensing/mkl/en/license.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 
   # Install profile and ld.so.config files
-  # We're not installing that weird mklvars.sh so we'll do it using a profile.d file.
   # See https://software.intel.com/en-us/mkl-linux-developer-guide-scripts-to-set-environment-variables
   install -Dm755 "${srcdir}/intel-mkl.sh" "${pkgdir}/etc/profile.d/intel-mkl.sh"
   install -Dm644 "${srcdir}/intel-mkl.conf" "${pkgdir}/etc/ld.so.conf.d/intel-mkl.conf"