diff options
| author | Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 2016-06-08 05:56:11 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-12 23:47:16 +0100 |
| commit | 35fb16dd12efd83bda7d2b9d39a15efa0d6060d9 (patch) | |
| tree | b79d8d5dfe8415ba6824e648a24b7b0cb36ab52d /meta/recipes-devtools/python-numpy/files | |
| parent | 6aaeced07bf301f85a40093f5e4b8950f89740bc (diff) | |
| download | poky-35fb16dd12efd83bda7d2b9d39a15efa0d6060d9.tar.gz | |
python-numpy: Upgrade from 1.10.4 to 1.11.0
Upgrades python-numpy and python3-numpy to 1.11.0,
Drops using distutils class, to use setuptools class instead,
this fixes a problem where after compilation the package was created
as an egg, see YOCTO #8673
Fixes source location for both packages and also adds a new patch
to fix the shebang on the f2py script, see YOCTO #9729
(From OE-Core rev: dd756bb8fdff676dba312e38ebc90c4c89dfe855)
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python-numpy/files')
| -rw-r--r-- | meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch b/meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch new file mode 100644 index 0000000000..6c61b09f65 --- /dev/null +++ b/meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | Upstream-Status: Inappropriate [embedded specific] | ||
| 2 | |||
| 3 | Avoids using python from the HOSTs native sysroot for f2py, | ||
| 4 | uses TARGET env python instead. | ||
| 5 | |||
| 6 | Signed-Off-By: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | ||
| 7 | |||
| 8 | Index: numpy-1.11.0/numpy/f2py/setup.py | ||
| 9 | =================================================================== | ||
| 10 | --- numpy-1.11.0.orig/numpy/f2py/setup.py | ||
| 11 | +++ numpy-1.11.0/numpy/f2py/setup.py | ||
| 12 | @@ -37,10 +37,13 @@ def _get_f2py_shebang(): | ||
| 13 | should be ``#!python`` rather than ``#!`` followed by the contents of | ||
| 14 | ``sys.executable``. | ||
| 15 | """ | ||
| 16 | - if set(('bdist_wheel', 'bdist_egg', 'bdist_wininst', | ||
| 17 | - 'bdist_rpm')).intersection(sys.argv): | ||
| 18 | - return '#!python' | ||
| 19 | - return '#!' + sys.executable | ||
| 20 | + #if set(('bdist_wheel', 'bdist_egg', 'bdist_wininst', | ||
| 21 | + # 'bdist_rpm')).intersection(sys.argv): | ||
| 22 | + # return '#!python' | ||
| 23 | + #return '#!' + sys.executable | ||
| 24 | + | ||
| 25 | + # On OE, we need to avoid using the HOSTs python-native, we return env python instead | ||
| 26 | + return '#!/usr/bin/env python' | ||
| 27 | |||
| 28 | |||
| 29 | def configuration(parent_package='', top_path=None): | ||
