pkgrel 3 with mpi

2 files changed, 28 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1712f9f4d75e..0a297d50f996 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Dec 19 18:33:48 UTC 2017
+# Thu Dec 21 20:39:44 UTC 2017
 pkgbase = intel-parallel-studio-xe
 	pkgdesc = Intel C++ C and FORTRAN compiler - Intel Parallel Studio XE - Cluster Edition - icc icpc ifort ipp mkl
 	pkgver = 2018.18.0.4.1.163
-	pkgrel = 2
+	pkgrel = 3
 	url = http://software.intel.com/en-us/articles/non-commercial-software-download/
 	arch = x86_64
 	license = custom
@@ -17,6 +17,7 @@ pkgbase = intel-parallel-studio-xe
 	options = libtool
 	options = staticlibs
 	source = http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12375/parallel_studio_xe_2018_update1_professional_edition.tgz
+	source = http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12414/l_mpi_2018.1.163.tgz
 	source = intel_compilers.sh
 	source = intel_vtune-amplifier.sh
 	source = intel_advisor.sh
@@ -35,6 +36,7 @@ pkgbase = intel-parallel-studio-xe
 	source = intel-tbb.install
 	source = EULA.txt
 	sha256sums = dd3e118069d87eebb614336732323b48172c8c8a653cde673a8ef02f7358e94d
+	sha256sums = 130b11571c3f71af00a722fa8641db5a1552ac343d770a8304216d8f5d00e75c
 	sha256sums = 75fcdfc246949341afddcf51b2037f606f25612a04c199ac1a743247aa7c4ea5
 	sha256sums = 278f9545d14c1fbec737bbfbcafb1b9090d35aab0dfeddc99d4c6e296b56057b
 	sha256sums = e3103fb1c5e2ec9f0cc4090abb7e273563e735d88e185f527c66b2aebd52e733
diff --git a/PKGBUILD b/PKGBUILD
index 5891fd6ac1e4..8041838b9ad4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -58,17 +58,17 @@ _v_b='163'
 
 _update='1'
 
-pkgrel=2
+pkgrel=3
 
 
 _sp='professional_edition'
-_icc_ver='18.0.4' 
-_mpi_ver='5.1.3' 
-_mkl_ver="11.3.3" 
-_tbb_ver='4.4.3' 
-_vtune_ver='0.2.525261' 
-_inspector_ver='1.0.522981' 
-_advisor_ver='1.0.523188' 
+_icc_ver='18.0.4'
+_mpi_ver='5.1.3'
+_mkl_ver="11.3.3"
+_tbb_ver='4.4.3'
+_vtune_ver='0.2.525261'
+_inspector_ver='1.0.522981'
+_advisor_ver='1.0.523188'
 
 # Same version from update 4 2017
 _vtune_man_ver='0.2.525261'
@@ -79,6 +79,7 @@ _advisor_man_ver='1.0.523188'
 pkgver=${_year}.${_icc_ver}.${_v_a}.${_v_b}
 
 _dir_nr='12375'
+_mpi_dir_nr='12414'
 
 options=(strip libtool staticlibs)
 
@@ -91,6 +92,7 @@ _parallel_studio_xe_dir="parallel_studio_xe${_year:+_${_year}}${_update:+_update
 
 source=(
   "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/${_dir_nr}/${_parallel_studio_xe_dir}.tgz"
+  "http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/${_mpi_dir_nr}/l_mpi_${_year}.${_v_a}.${_v_b}.tgz"
   'intel_compilers.sh'
   'intel_vtune-amplifier.sh'
   'intel_advisor.sh'
@@ -112,6 +114,7 @@ source=(
 
 
 sha256sums=('dd3e118069d87eebb614336732323b48172c8c8a653cde673a8ef02f7358e94d'
+            '130b11571c3f71af00a722fa8641db5a1552ac343d770a8304216d8f5d00e75c'
             '75fcdfc246949341afddcf51b2037f606f25612a04c199ac1a743247aa7c4ea5'
             '278f9545d14c1fbec737bbfbcafb1b9090d35aab0dfeddc99d4c6e296b56057b'
             'e3103fb1c5e2ec9f0cc4090abb7e273563e735d88e185f527c66b2aebd52e733'
@@ -154,10 +157,19 @@ extract_rpms() {
   done
 }
 
+extract_mpi_rpms() {
+  cd $2
+  for rpm_file in ${mpi_rpm_dir}/$1 ; do
+    echo -e "    Extracting: ${rpm_file}"
+    bsdtar -xf ${rpm_file}
+  done
+}
+
 set_build_vars() {
   _pkg_ver=${_year}.${_icc_ver}.${_v_a}.${_v_b}
   _composer_xe_dir="compilers_and_libraries_${_year}.${_v_a}.${_v_b}"
   rpm_dir=${srcdir}/${_parallel_studio_xe_dir}/rpm
+  mpi_rpm_dir=${srcdir}/l_mpi_${_year}.${_v_a}.${_v_b}/rpm
   xe_build_dir=${srcdir}/cxe_build
   base_dir=${srcdir}/..
   _man_dir=${xe_build_dir}/usr/share/man/man1
@@ -566,7 +578,7 @@ package_intel-mpi() {
 
   echo -e " # intel-mpi: Extracting RPMS "
   extract_rpms 'intel-mpi-*.rpm'  $xe_build_dir
-
+  extract_mpi_rpms 'intel-mpi-sdk-*.rpm'  $xe_build_dir
 
   echo -e " # intel-mpi: Editing variables "
   cd ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/mpi/${_i_arch}/bin
@@ -580,6 +592,9 @@ package_intel-mpi() {
 
   chmod a+x mpivars.sh
 
+  rm -rf ${xe_build_dir}/opt/intel/${_composer_xe_dir}/linux/mpi_2019
+  rm -rf ${xe_build_dir}/opt/intel/${_composer_xe_dir}/licensing/mpi_2019
+
   echo -e " # intel-mpi: Move package "
   mv ${xe_build_dir}/opt ${pkgdir}
   mv ${xe_build_dir}/etc ${pkgdir}