[arch-commits] Commit in intel-mkl/repos/community-x86_64 (7 files)

Sven-Hendrik Haase svenstaro at archlinux.org
Mon Jun 15 00:08:13 UTC 2020


    Date: Monday, June 15, 2020 @ 00:08:13
  Author: svenstaro
Revision: 644743

archrelease: copy trunk to community-x86_64

Added:
  intel-mkl/repos/community-x86_64/PKGBUILD
    (from rev 644742, intel-mkl/trunk/PKGBUILD)
  intel-mkl/repos/community-x86_64/intel-mkl.conf
    (from rev 644742, intel-mkl/trunk/intel-mkl.conf)
  intel-mkl/repos/community-x86_64/intel-mkl.sh
    (from rev 644742, intel-mkl/trunk/intel-mkl.sh)
  intel-mkl/repos/community-x86_64/mklvars.sh
    (from rev 644742, intel-mkl/trunk/mklvars.sh)
Deleted:
  intel-mkl/repos/community-x86_64/PKGBUILD
  intel-mkl/repos/community-x86_64/intel-mkl.conf
  intel-mkl/repos/community-x86_64/intel-mkl.sh

----------------+
 PKGBUILD       |  171 +++++++++++++++++++++++++++----------------------------
 intel-mkl.conf |    4 -
 intel-mkl.sh   |    2 
 mklvars.sh     |   11 +++
 4 files changed, 100 insertions(+), 88 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-15 00:08:03 UTC (rev 644742)
+++ PKGBUILD	2020-06-15 00:08:13 UTC (rev 644743)
@@ -1,85 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
-# Redistribution information:
-# https://software.intel.com/en-us/mkl
-# https://software.intel.com/en-us/articles/intel-math-kernel-library-license-faq
-pkgbase=intel-mkl
-pkgname=(intel-mkl intel-mkl-static)
-pkgver=2020.1.217
-_pkgver=${pkgver/%./-/}
-_weirdnum=16533
-pkgrel=5
-pkgdesc="Intel Math Kernel Library"
-arch=(x86_64)
-depends=('gcc-libs')
-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"
-        intel-mkl.sh
-        intel-mkl.conf)
-options=(!strip staticlibs)
-sha512sums=('ad3993ba2005168eb273942109ceeffb392f86c083643db9a2e25c7a168ab77d3e2c985c9ebf7841ad8e27ba0e2c0cedace20860ba450d5bfcccd5be23dc62dd'
-            '1268685ff3ccd47733084dedcd4ea0d393f4ed3f6d00cd92125765ae5c8e14e7fe49b82692b3f667bfea931ad3c284a1c1c37235b474db09b5350c0046566c3c'
-            'c7181ee34a8225eefcd66f937e58b29184181c1caa1f24ce264b6fb4c0415fcde743aff3c1a2b165c2af1920dda6c50f5e470a94fe1e11ea61b4ceb9388c3ce4')
-
-prepare() {
-  cd l_mkl_$pkgver/rpm
-  for rpm in *.rpm; do
-    bsdtar -xf $rpm
-  done
-
-  sed -i \
-    -e 's|^prefix=.*|prefix=/opt/intel/mkl|g' \
-    -e 's|${MKLROOT}|/opt/intel/mkl|g' \
-    -e 's|^omplibdir=.*|omplibdir=/opt/intel/mkl/lib/intel64|g' \
-    opt/intel/compilers_and_libraries_${pkgver}/linux/mkl/bin/pkgconfig/*.pc
-}
-
-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
-
-  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
-  ln -s /opt/intel/mkl/bin/mkl_link_tool "${pkgdir}"/usr/bin/mkl_link_tool
-
-  mkdir -p "${pkgdir}/usr/lib/pkgconfig"
-  cp opt/intel/compilers_and_libraries_${pkgver}/linux/mkl/bin/pkgconfig/mkl-dynamic* "${pkgdir}/usr/lib/pkgconfig/"
-
-  mkdir -p "${pkgdir}"/opt/intel/mkl/lib/intel64
-  ln -s intel64 "${pkgdir}"/opt/intel/mkl/lib/intel64_lin
-
-  # 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/*.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
-  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
-  # 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"
-}
-
-package_intel-mkl-static() {
-  pkgdesc="Intel Math Kernel Library (static libraries)"
-  depends=('intel-mkl')
-
-  cd l_mkl_$pkgver/rpm
-
-  mkdir -p "${pkgdir}/usr/lib/pkgconfig"
-  cp opt/intel/compilers_and_libraries_${pkgver}/linux/mkl/bin/pkgconfig/mkl-static* "${pkgdir}/usr/lib/pkgconfig/"
-
-  mkdir -p "${pkgdir}"/opt/intel/mkl/lib/intel64
-  cp opt/intel/compilers_and_libraries_${pkgver}/linux/mkl/lib/intel64_lin/*.a "${pkgdir}"/opt/intel/mkl/lib/intel64
-  cp opt/intel/compilers_and_libraries_${pkgver}/linux/compiler/lib/intel64_lin/*.a "${pkgdir}"/opt/intel/mkl/lib/intel64
-
-  chmod 644 "${pkgdir}"/opt/intel/mkl/lib/intel64/*.a
-}
-# vim:set ts=2 sw=2 et:

Copied: intel-mkl/repos/community-x86_64/PKGBUILD (from rev 644742, intel-mkl/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-06-15 00:08:13 UTC (rev 644743)
@@ -0,0 +1,86 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+# Redistribution information:
+# https://software.intel.com/en-us/mkl
+# https://software.intel.com/en-us/articles/intel-math-kernel-library-license-faq
+pkgbase=intel-mkl
+pkgname=(intel-mkl intel-mkl-static)
+pkgver=2020.1.217
+_pkgver=${pkgver/%./-/}
+_weirdnum=16533
+pkgrel=6
+pkgdesc="Intel Math Kernel Library"
+arch=(x86_64)
+depends=('gcc-libs')
+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')
+
+prepare() {
+  cd l_mkl_$pkgver/rpm
+  for rpm in *.rpm; do
+    bsdtar -xf $rpm
+  done
+
+  sed -i \
+    -e 's|^prefix=.*|prefix=/opt/intel/mkl|g' \
+    -e 's|${MKLROOT}|/opt/intel/mkl|g' \
+    -e 's|^omplibdir=.*|omplibdir=/opt/intel/mkl/lib/intel64|g' \
+    opt/intel/compilers_and_libraries_${pkgver}/linux/mkl/bin/pkgconfig/*.pc
+}
+
+package_intel-mkl() {
+  cd l_mkl_$pkgver/rpm
+
+  # 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
+  ln -s /opt/intel/mkl/bin/mkl_link_tool "${pkgdir}"/usr/bin/mkl_link_tool
+
+  mkdir -p "${pkgdir}/usr/lib/pkgconfig"
+  cp opt/intel/compilers_and_libraries_${pkgver}/linux/mkl/bin/pkgconfig/mkl-dynamic* "${pkgdir}/usr/lib/pkgconfig/"
+
+  mkdir -p "${pkgdir}"/opt/intel/mkl/lib/intel64
+  ln -s intel64 "${pkgdir}"/opt/intel/mkl/lib/intel64_lin
+
+  # 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/*.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
+  # 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"
+}
+
+package_intel-mkl-static() {
+  pkgdesc="Intel Math Kernel Library (static libraries)"
+  depends=('intel-mkl')
+
+  cd l_mkl_$pkgver/rpm
+
+  mkdir -p "${pkgdir}/usr/lib/pkgconfig"
+  cp opt/intel/compilers_and_libraries_${pkgver}/linux/mkl/bin/pkgconfig/mkl-static* "${pkgdir}/usr/lib/pkgconfig/"
+
+  mkdir -p "${pkgdir}"/opt/intel/mkl/lib/intel64
+  cp opt/intel/compilers_and_libraries_${pkgver}/linux/mkl/lib/intel64_lin/*.a "${pkgdir}"/opt/intel/mkl/lib/intel64
+  cp opt/intel/compilers_and_libraries_${pkgver}/linux/compiler/lib/intel64_lin/*.a "${pkgdir}"/opt/intel/mkl/lib/intel64
+
+  chmod 644 "${pkgdir}"/opt/intel/mkl/lib/intel64/*.a
+}
+# vim:set ts=2 sw=2 et:

Deleted: intel-mkl.conf
===================================================================
--- intel-mkl.conf	2020-06-15 00:08:03 UTC (rev 644742)
+++ intel-mkl.conf	2020-06-15 00:08:13 UTC (rev 644743)
@@ -1,2 +0,0 @@
-/opt/intel/mkl/lib/intel64
-/opt/intel/mkl/lib/intel64_lin

Copied: intel-mkl/repos/community-x86_64/intel-mkl.conf (from rev 644742, intel-mkl/trunk/intel-mkl.conf)
===================================================================
--- intel-mkl.conf	                        (rev 0)
+++ intel-mkl.conf	2020-06-15 00:08:13 UTC (rev 644743)
@@ -0,0 +1,2 @@
+/opt/intel/mkl/lib/intel64
+/opt/intel/mkl/lib/intel64_lin

Deleted: intel-mkl.sh
===================================================================
--- intel-mkl.sh	2020-06-15 00:08:03 UTC (rev 644742)
+++ intel-mkl.sh	2020-06-15 00:08:13 UTC (rev 644743)
@@ -1 +0,0 @@
-export MKLROOT=/opt/intel/mkl

Copied: intel-mkl/repos/community-x86_64/intel-mkl.sh (from rev 644742, intel-mkl/trunk/intel-mkl.sh)
===================================================================
--- intel-mkl.sh	                        (rev 0)
+++ intel-mkl.sh	2020-06-15 00:08:13 UTC (rev 644743)
@@ -0,0 +1 @@
+export MKLROOT=/opt/intel/mkl

Copied: intel-mkl/repos/community-x86_64/mklvars.sh (from rev 644742, intel-mkl/trunk/mklvars.sh)
===================================================================
--- mklvars.sh	                        (rev 0)
+++ mklvars.sh	2020-06-15 00:08:13 UTC (rev 644743)
@@ -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}"



More information about the arch-commits mailing list