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

[Sven-Hendrik Haase]

    Date: Sunday, February 16, 2020 @ 17:40:49
  Author: svenstaro
Revision: 572738

upgpkg: intel-mkl 2020.0.166-2: Follw upstream's way and stuff things into /opt/intel/mkl

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

----------------+
 PKGBUILD       |   24 +++++++++++++++++-------
 intel-mkl.conf |    1 +
 intel-mkl.sh   |    1 +
 3 files changed, 19 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-16 17:22:40 UTC (rev 572737)
+++ PKGBUILD	2020-02-16 17:40:49 UTC (rev 572738)
@@ -5,13 +5,17 @@
 pkgname=intel-mkl
 pkgver=2020.0.166
 _pkgver=${pkgver/%./-/}
-pkgrel=1
+pkgrel=2
 pkgdesc="Intel Math Kernel Library"
 arch=(x86_64)
 url="https://software.intel.com/en-us/mkl"
 license=("custom:ISSL")
-source=("http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16318/l_mkl_$pkgver.tgz")
-sha512sums=('470bdb6b435ad938a520185fcd35ab4ce1656da0884c32506575077f398b3db84d5eeb4ac9f1af5a4d29dc9c30d473c4ff82effe8015c4f2dd8e0e4038155127')
+source=("http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16318/l_mkl_$pkgver.tgz"
+        intel-mkl.sh
+        intel-mkl.conf)
+sha512sums=('470bdb6b435ad938a520185fcd35ab4ce1656da0884c32506575077f398b3db84d5eeb4ac9f1af5a4d29dc9c30d473c4ff82effe8015c4f2dd8e0e4038155127'
+            '1268685ff3ccd47733084dedcd4ea0d393f4ed3f6d00cd92125765ae5c8e14e7fe49b82692b3f667bfea931ad3c284a1c1c37235b474db09b5350c0046566c3c'
+            '8dd145af32158978f2257c5916a316c3a4f427224968f54b429d47651f38f8df7da5aba35c45c6d87fd35bc659e01e99f708404743d53d0034bd46992c3b4b3a')
 
 prepare() {
   cd l_mkl_$pkgver/rpm
@@ -23,11 +27,17 @@
 package() {
   cd l_mkl_$pkgver/rpm
 
-  mkdir -p "${pkgdir}"/usr/include
-  mkdir -p "${pkgdir}"/usr/lib
+  mkdir -p "${pkgdir}"/opt/intel/mkl/lib
 
-  cp opt/intel/compilers_and_libraries_${pkgver}/linux/mkl/lib/intel64_lin/*.{a,so} "${pkgdir}"/usr/lib/
-  cp -r opt/intel/compilers_and_libraries_${pkgver}/linux/mkl/include "${pkgdir}"/usr/include/mkl
+  # Sadly Intel seems to expect a certain structure for MKL:
+  # 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 -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
+  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"
 }
 # vim:set ts=2 sw=2 et:

Added: intel-mkl.conf
===================================================================
--- intel-mkl.conf	                        (rev 0)
+++ intel-mkl.conf	2020-02-16 17:40:49 UTC (rev 572738)
@@ -0,0 +1 @@
+/opt/intel/mkl/lib

Added: intel-mkl.sh
===================================================================
--- intel-mkl.sh	                        (rev 0)
+++ intel-mkl.sh	2020-02-16 17:40:49 UTC (rev 572738)
@@ -0,0 +1 @@
+export MKLROOT=/opt/intel/mkl