diff options
| author | Vladimir Khodygo | 2019-02-10 14:04:09 +0000 |
|---|---|---|
| committer | Vladimir Khodygo | 2019-02-10 14:04:09 +0000 |
| commit | 33a29a9f033084fe6d0032dadec4a5e7b160684e (patch) | |
| tree | b0ecdf9e16f2cf8212b15d3c7a82247cb9719e0b | |
| parent | d3f1a5d1e7b38516c71893f4fd2db6d5f9ed2033 (diff) | |
| download | aur-33a29a9f033084fe6d0032dadec4a5e7b160684e.tar.gz | |
temp fix -- now can build scipy-mkl
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | fix_compiler.patch | 11 |
3 files changed, 21 insertions, 5 deletions
@@ -1,7 +1,7 @@ pkgbase = python-numpy-mkl pkgdesc = Scientific tools for Python compiled with intel mkl pkgver = 1.16.1 - pkgrel = 1 + pkgrel = 2 url = http://numpy.scipy.org/ arch = i686 arch = x86_64 @@ -19,10 +19,12 @@ pkgbase = python-numpy-mkl source = site64.cfg source = site32.cfg source = intelccompiler.py.patch + source = fix_compiler.patch sha256sums = 59485e2d172c4c3e27307969ef2c1220b98efcf59cbf373bec41da19f7b69b92 sha256sums = 86cd68a695a5e1d76f8e53cda70c888c4ed04349f15c8096d4492e346e7187e1 sha256sums = 882f2717deca0fd6a2e2384aac2dc7973c566f9cd2ba46777c3b5ffdffa814df sha256sums = 0d185daf0f2fcab08778173f54cee86cd88dc3c6703413686ab3742c0097db4e + sha256sums = 7389feba5dc3db997be652fc8d98d573a936c62c4ef5272c142598636fcea2df pkgname = python-numpy-mkl depends = intel-mkl @@ -10,7 +10,7 @@ pkgname="python-numpy-mkl" true && pkgname=('python-numpy-mkl' 'python2-numpy-mkl') #pkgname=('python-numpy') pkgver=1.16.1 -pkgrel=1 +pkgrel=2 pkgdesc="Scientific tools for Python compiled with intel mkl" arch=('i686' 'x86_64') license=('custom') @@ -20,15 +20,16 @@ depends=('intel-mkl' 'python' 'python2') makedepends=('python-setuptools' 'python2-setuptools' 'intel-compiler-base' 'intel-fortran-compiler' 'cython') source=(https://github.com/numpy/numpy/archive/v${pkgver}.tar.gz - 'site64.cfg' 'site32.cfg' 'intelccompiler.py.patch') + 'site64.cfg' 'site32.cfg' 'intelccompiler.py.patch' + 'fix_compiler.patch') sha256sums=('59485e2d172c4c3e27307969ef2c1220b98efcf59cbf373bec41da19f7b69b92' '86cd68a695a5e1d76f8e53cda70c888c4ed04349f15c8096d4492e346e7187e1' '882f2717deca0fd6a2e2384aac2dc7973c566f9cd2ba46777c3b5ffdffa814df' - '0d185daf0f2fcab08778173f54cee86cd88dc3c6703413686ab3742c0097db4e') + '0d185daf0f2fcab08778173f54cee86cd88dc3c6703413686ab3742c0097db4e' + '7389feba5dc3db997be652fc8d98d573a936c62c4ef5272c142598636fcea2df') build() { -#1.16.1 runs tests slower for some reason #cd "${srcdir}" patch ${srcdir}/numpy-${pkgver}/numpy/distutils/intelccompiler.py < ${srcdir}/intelccompiler.py.patch @@ -119,6 +120,7 @@ package_python2-numpy-mkl() { $(find ${pkgdir} -name '*.py') mv "$pkgdir"/usr/bin/f2py{,2} + patch ${pkgdir}/usr/lib/python2.7/site-packages/numpy/distutils/ccompiler.py < ${srcdir}/fix_compiler.patch } package_python-numpy-mkl() { @@ -133,4 +135,5 @@ package_python-numpy-mkl() { install -m755 -d "${pkgdir}/usr/share/licenses/python-numpy" install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python-numpy/" + patch ${pkgdir}/usr/lib/python3.7/site-packages/numpy/distutils/ccompiler.py < ${srcdir}/fix_compiler.patch } diff --git a/fix_compiler.patch b/fix_compiler.patch new file mode 100644 index 000000000000..e0e8a1f0b221 --- /dev/null +++ b/fix_compiler.patch @@ -0,0 +1,11 @@ +--- ccompiler.py 2019-01-31 20:54:00.000000000 +0000 ++++ _ccompiler.py 2019-02-09 21:32:04.270976061 +0000 +@@ -639,7 +639,7 @@ + return version + + try: +- output = subprocess.check_output(version_cmd) ++ output = subprocess.check_output(version_cmd, stderr=subprocess.STDOUT) + except subprocess.CalledProcessError as exc: + output = exc.output + status = exc.returncode |