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

[Sven-Hendrik Haase]

    Date: Monday, June 15, 2020 @ 00:08:03
  Author: svenstaro
Revision: 644742

upgpkg: intel-mkl 2020.1.217-6: Ship mklvars.sh shim and locales dir

Added:
  intel-mkl/trunk/mklvars.sh
Modified:
  intel-mkl/trunk/PKGBUILD

------------+
 PKGBUILD   |   13 +++++++------
 mklvars.sh |   11 +++++++++++
 2 files changed, 18 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-15 00:05:39 UTC (rev 644741)
+++ PKGBUILD	2020-06-15 00:08:03 UTC (rev 644742)
@@ -7,7 +7,7 @@
 pkgver=2020.1.217
 _pkgver=${pkgver/%./-/}
 _weirdnum=16533
-pkgrel=5
+pkgrel=6
 pkgdesc="Intel Math Kernel Library"
 arch=(x86_64)
 depends=('gcc-libs')
@@ -14,10 +14,12 @@
 url="https://software.intel.com/en-us/mkl"
 license=("custom:ISSL")
 source=("http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/$_weirdnum/l_mkl_$pkgver.tgz"
+        mklvars.sh
         intel-mkl.sh
         intel-mkl.conf)
 options=(!strip staticlibs)
 sha512sums=('ad3993ba2005168eb273942109ceeffb392f86c083643db9a2e25c7a168ab77d3e2c985c9ebf7841ad8e27ba0e2c0cedace20860ba450d5bfcccd5be23dc62dd'
+            '827d90c756d5e8e81092683dd459e10b06f58dc93567f9cb1eee6fdc65fe52a84c45eb0b015857b30d41ab8c57a3c2e95ffcca3fa9e80393797c7616ddffbfd5'
             '1268685ff3ccd47733084dedcd4ea0d393f4ed3f6d00cd92125765ae5c8e14e7fe49b82692b3f667bfea931ad3c284a1c1c37235b474db09b5350c0046566c3c'
             'c7181ee34a8225eefcd66f937e58b29184181c1caa1f24ce264b6fb4c0415fcde743aff3c1a2b165c2af1920dda6c50f5e470a94fe1e11ea61b4ceb9388c3ce4')
 
@@ -37,11 +39,9 @@
 package_intel-mkl() {
   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
+  # Instead of the original mklvars.sh which is basically just a fairly botchy pkg-config replacement by Intel,
+  # we'll ship a file which just exports some static values. The reason is that some software expects this file.
+  install -Dm755 "${srcdir}"/mklvars.sh "${pkgdir}"/usr/bin/mklvars.sh
 
   mkdir -p "${pkgdir}/usr/bin"
   install -Dm755 opt/intel/compilers_and_libraries_${pkgver}/linux/mkl/bin/mkl_link_tool "${pkgdir}"/opt/intel/mkl/bin/mkl_link_tool
@@ -59,6 +59,7 @@
   cp opt/intel/compilers_and_libraries_${pkgver}/linux/mkl/lib/intel64_lin/*.so "${pkgdir}"/opt/intel/mkl/lib/intel64
   cp opt/intel/compilers_and_libraries_${pkgver}/linux/compiler/lib/intel64_lin/*.so "${pkgdir}"/opt/intel/mkl/lib/intel64
   cp -r opt/intel/compilers_and_libraries_${pkgver}/linux/mkl/include "${pkgdir}"/opt/intel/mkl/include
+  cp -r opt/intel/compilers_and_libraries_${pkgver}/linux/mkl/lib/intel64_lin/locale "${pkgdir}"/opt/intel/mkl/lib/intel64
   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

Added: mklvars.sh
===================================================================
--- mklvars.sh	                        (rev 0)
+++ mklvars.sh	2020-06-15 00:08:03 UTC (rev 644742)
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# This little script pretends to be mklvars.sh but actually just exports some variables
+# to directories precisely where Arch installs them. No point shipping the original
+# mklvars.sh which wrongly guesses all the paths.
+
+export "LD_LIBRARY_PATH=/opt/intel/mkl/lib/intel64_lin:${LD_LIBRARY_PATH}"
+export "LIBRARY_PATH=/opt/intel/mkl/lib/intel64_lin:${LIBRARY_PATH}"
+export "NLSPATH=/opt/intel/mkl/lib/intel64_lin/locale/%l_%t/%N:${NLSPATH}"
+export "CPATH=/opt/intel/mkl/include:${CPATH}"
+export "PKG_CONFIG_PATH=/usr/lib/pkgconfig:${PKG_CONFIG_PATH}"