summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--zsh-fix.patch12
3 files changed, 20 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ef372e84f69d..0b2d11f2d11e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = intel-parallel-studio-xe
pkgdesc = Intel C++ C and FORTRAN compiler - Intel Parallel Studio XE - Cluster Edition - icc icpc ifort ipp
pkgver = 2020.2.254
- pkgrel = 4
+ pkgrel = 5
url = http://software.intel.com/en-us/articles/non-commercial-software-download/
arch = x86_64
license = custom
@@ -27,6 +27,7 @@ pkgbase = intel-parallel-studio-xe
source = intel-ipp.conf
source = intel-tbb.conf
source = intel-tbb.install
+ source = zsh-fix.patch
source = EULA.txt
sha256sums = 4795c44374e8988b91da20ac8f13022d7d773461def4a26ca210a8694f69f133
sha256sums = 0704025fdfe40e4fce08e88b641128310c3a3b51332668aab60fb815b424f52b
@@ -41,6 +42,7 @@ pkgbase = intel-parallel-studio-xe
sha256sums = da6f41c2e002c9a793c75a18c8d1c85ef7ef5bf83a7a0a158ff144481491aac8
sha256sums = 5d3ac1ba31d7fc5795821d95b17956b0c977c8f3576b02f664f8ebf476213a43
sha256sums = fde83eb0071a5bd2887de127b56cc573a254e30131ec7b2d956987512c3e90c2
+ sha256sums = aa45c10e3a8b16509714a55927c91912451057abf2249432ef06c314bb03818a
sha256sums = 228ac25e147adb9b872e1a562e522d2fd48809ccae89b765112009896a6d55a5
pkgname = intel-common-libs
diff --git a/PKGBUILD b/PKGBUILD
index cbc5c457597c..509ceece7a23 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -88,7 +88,7 @@ _v_b='254'
_update='2'
-pkgrel=4
+pkgrel=5
_sp='cluster_edition'
_icc_ver='19.1.2'
@@ -125,6 +125,7 @@ source=(
'intel-ipp.conf'
'intel-tbb.conf'
'intel-tbb.install'
+ 'zsh-fix.patch'
'EULA.txt'
)
sha256sums=('4795c44374e8988b91da20ac8f13022d7d773461def4a26ca210a8694f69f133'
@@ -140,6 +141,7 @@ sha256sums=('4795c44374e8988b91da20ac8f13022d7d773461def4a26ca210a8694f69f133'
'da6f41c2e002c9a793c75a18c8d1c85ef7ef5bf83a7a0a158ff144481491aac8'
'5d3ac1ba31d7fc5795821d95b17956b0c977c8f3576b02f664f8ebf476213a43'
'fde83eb0071a5bd2887de127b56cc573a254e30131ec7b2d956987512c3e90c2'
+ 'aa45c10e3a8b16509714a55927c91912451057abf2249432ef06c314bb03818a'
'228ac25e147adb9b872e1a562e522d2fd48809ccae89b765112009896a6d55a5')
@@ -404,6 +406,8 @@ package_intel-compiler-base() {
ln -s ./${_composer_xe_dir}/linux/bin/${_i_arch} bin
ln -s ./${_composer_xe_dir}/linux/pkg_bin pkg_bin
+ patch -p0 < ${srcdir}/zsh-fix.patch
+
#ln -s ./${_composer_xe_dir}/linux/debugger/lib/${_i_arch} debugger_lib
#ln -s ./${_composer_xe_dir}/linux/man/ man
}
diff --git a/zsh-fix.patch b/zsh-fix.patch
new file mode 100644
index 000000000000..1fd83a8d80ed
--- /dev/null
+++ b/zsh-fix.patch
@@ -0,0 +1,12 @@
+--- composerxe/linux/bin/compilervars.sh 2020-07-23 05:25:54.000000000 +0900
++++ composerxe/linux/bin/compilervars_fix.sh 2020-08-09 02:47:46.130971704 +0900
+@@ -112,7 +112,8 @@
+ # ------------------function remove_duplicate_paths----------------------------
+ remove_duplicate_paths() {
+ local arg=$1
+- local arr=(`echo ${!arg} | sed 's/:/\n/g'`)
++ eval "value=\"\${$arg}\""
++ local arr=(`echo ${value} | sed 's/:/\n/g'`)
+ local fixarr=()
+ local found=
+ local i=0