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

[Sven-Hendrik Haase]

    Date: Tuesday, March 3, 2020 @ 18:18:22
  Author: svenstaro
Revision: 589795

upgpkg: intel-mkl 2020.0.166-5: Put libs where upstream expects them to be (fixes FS#65663)

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

----------------+
 PKGBUILD       |   10 +++++-----
 intel-mkl.conf |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-03 18:09:33 UTC (rev 589794)
+++ PKGBUILD	2020-03-03 18:18:22 UTC (rev 589795)
@@ -5,7 +5,7 @@
 pkgname=intel-mkl
 pkgver=2020.0.166
 _pkgver=${pkgver/%./-/}
-pkgrel=4
+pkgrel=5
 pkgdesc="Intel Math Kernel Library"
 arch=(x86_64)
 url="https://software.intel.com/en-us/mkl"
@@ -15,7 +15,7 @@
         intel-mkl.conf)
 sha512sums=('470bdb6b435ad938a520185fcd35ab4ce1656da0884c32506575077f398b3db84d5eeb4ac9f1af5a4d29dc9c30d473c4ff82effe8015c4f2dd8e0e4038155127'
             '1268685ff3ccd47733084dedcd4ea0d393f4ed3f6d00cd92125765ae5c8e14e7fe49b82692b3f667bfea931ad3c284a1c1c37235b474db09b5350c0046566c3c'
-            '8dd145af32158978f2257c5916a316c3a4f427224968f54b429d47651f38f8df7da5aba35c45c6d87fd35bc659e01e99f708404743d53d0034bd46992c3b4b3a')
+            '6e480cf43112fdb9ea294ed73c897f1cf739d7bacb428e90758e38a99b328db80ec8ccd244f4e684fb6cc3eb972ba0e97d3dc39c70ef158030ce870cb4d5e68a')
 
 prepare() {
   cd l_mkl_$pkgver/rpm
@@ -37,13 +37,13 @@
   install -Dm755 opt/intel/compilers_and_libraries_${pkgver}/linux/mkl/tools/mkl_link_tool "${pkgdir}"/opt/intel/mkl/tools/mkl_link_tool
   ln -s /opt/intel/mkl/tools/mkl_link_tool "${pkgdir}"/usr/bin/mkl_link_tool
 
-  mkdir -p "${pkgdir}"/opt/intel/mkl/lib
+  mkdir -p "${pkgdir}"/opt/intel/mkl/lib/intel64
 
   # Sadly Intel seems to expect a certain structure for MKL
   # 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 opt/intel/compilers_and_libraries_${pkgver}/linux/mkl/lib/intel64_lin/*.{a,so} "${pkgdir}"/opt/intel/mkl/lib/intel64
+  cp opt/intel/compilers_and_libraries_${pkgver}/linux/compiler/lib/intel64_lin/*.{a,so} "${pkgdir}"/opt/intel/mkl/lib/intel64
   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
 

Modified: intel-mkl.conf
===================================================================
--- intel-mkl.conf	2020-03-03 18:09:33 UTC (rev 589794)
+++ intel-mkl.conf	2020-03-03 18:18:22 UTC (rev 589795)
@@ -1 +1 @@
-/opt/intel/mkl/lib
+/opt/intel/mkl/lib/intel64