summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlejandro Hernandez <alejandro.hernandez@linux.intel.com>2016-06-08 05:56:11 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-12 23:47:16 +0100
commit35fb16dd12efd83bda7d2b9d39a15efa0d6060d9 (patch)
treeb79d8d5dfe8415ba6824e648a24b7b0cb36ab52d /meta/recipes-devtools
parent6aaeced07bf301f85a40093f5e4b8950f89740bc (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch29
-rw-r--r--meta/recipes-devtools/python-numpy/python-numpy_1.11.0.bb (renamed from meta/recipes-devtools/python-numpy/python-numpy_1.10.4.bb)14
-rw-r--r--meta/recipes-devtools/python-numpy/python3-numpy_1.11.0.bb (renamed from meta/recipes-devtools/python-numpy/python3-numpy_1.10.4.bb)15
3 files changed, 46 insertions, 12 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 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Avoids using python from the HOSTs native sysroot for f2py,
4uses TARGET env python instead.
5
6Signed-Off-By: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
7
8Index: 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):
diff --git a/meta/recipes-devtools/python-numpy/python-numpy_1.10.4.bb b/meta/recipes-devtools/python-numpy/python-numpy_1.11.0.bb
index ca6a7abb0e..51ef171052 100644
--- a/meta/recipes-devtools/python-numpy/python-numpy_1.10.4.bb
+++ b/meta/recipes-devtools/python-numpy/python-numpy_1.11.0.bb
@@ -1,12 +1,14 @@
1SUMMARY = "A sophisticated Numeric Processing Package for Python" 1SUMMARY = "A sophisticated Numeric Processing Package for Python"
2SECTION = "devel/python" 2SECTION = "devel/python"
3LICENSE = "PSF" 3LICENSE = "PSF"
4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9f4e88b5748e8313caaf33d081ce65a3" 4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7e51a5677b22b865abbfb3dff6ffb2d0"
5 5
6SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \ 6SRCNAME = "numpy"
7
8SRC_URI = "https://files.pythonhosted.org/packages/source/n/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
7 file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ 9 file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \
8 file://remove-build-path-in-comments.patch \ 10 file://remove-build-path-in-comments.patch \
9 file://add-glibc-check.patch \ 11 file://fix_shebang_f2py.patch \
10 ${CONFIGFILESURI} " 12 ${CONFIGFILESURI} "
11 13
12CONFIGFILESURI ?= "" 14CONFIGFILESURI ?= ""
@@ -58,7 +60,7 @@ CONFIGFILESURI_mips64n32 = " \
58 60
59S = "${WORKDIR}/numpy-${PV}" 61S = "${WORKDIR}/numpy-${PV}"
60 62
61inherit distutils 63inherit setuptools
62 64
63# Make the build fail and replace *config.h with proper one 65# Make the build fail and replace *config.h with proper one
64# This is a ugly, ugly hack - Koen 66# This is a ugly, ugly hack - Koen
@@ -70,8 +72,8 @@ do_compile_prepend_class-target() {
70 72
71FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a" 73FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a"
72 74
73SRC_URI[md5sum] = "90bb9034652cefbada19cf7d141a6a61" 75SRC_URI[md5sum] = "bc56fb9fc2895aa4961802ffbdb31d0b"
74SRC_URI[sha256sum] = "f7f91842056a7cf680b0eaf8cefc5e46c69e2521e651128d2e6aaaccec8652ae" 76SRC_URI[sha256sum] = "a1d1268d200816bfb9727a7a27b78d8e37ecec2e4d5ebd33eb64e2789e0db43e"
75 77
76# install what is needed for numpy.test() 78# install what is needed for numpy.test()
77RDEPENDS_${PN} = "python-unittest \ 79RDEPENDS_${PN} = "python-unittest \
diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.10.4.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.11.0.bb
index dcd23ac98d..218909bfed 100644
--- a/meta/recipes-devtools/python-numpy/python3-numpy_1.10.4.bb
+++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.11.0.bb
@@ -1,12 +1,14 @@
1SUMMARY = "A sophisticated Numeric Processing Package for Python" 1SUMMARY = "A sophisticated Numeric Processing Package for Python"
2SECTION = "devel/python" 2SECTION = "devel/python"
3LICENSE = "PSF" 3LICENSE = "PSF"
4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9f4e88b5748e8313caaf33d081ce65a3" 4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7e51a5677b22b865abbfb3dff6ffb2d0"
5 5
6SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \ 6SRCNAME = "numpy"
7
8SRC_URI = "https://files.pythonhosted.org/packages/source/n/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
7 file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ 9 file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \
8 file://remove-build-path-in-comments.patch \ 10 file://remove-build-path-in-comments.patch \
9 file://add-glibc-check.patch \ 11 file://fix_shebang_f2py.patch \
10 ${CONFIGFILESURI} " 12 ${CONFIGFILESURI} "
11 13
12CONFIGFILESURI ?= "" 14CONFIGFILESURI ?= ""
@@ -58,7 +60,7 @@ CONFIGFILESURI_mips64n32 = " \
58 60
59S = "${WORKDIR}/numpy-${PV}" 61S = "${WORKDIR}/numpy-${PV}"
60 62
61inherit distutils3 63inherit setuptools3
62 64
63# Make the build fail and replace *config.h with proper one 65# Make the build fail and replace *config.h with proper one
64# This is a ugly, ugly hack - Koen 66# This is a ugly, ugly hack - Koen
@@ -70,8 +72,8 @@ do_compile_prepend_class-target() {
70 72
71FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a" 73FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a"
72 74
73SRC_URI[md5sum] = "90bb9034652cefbada19cf7d141a6a61" 75SRC_URI[md5sum] = "bc56fb9fc2895aa4961802ffbdb31d0b"
74SRC_URI[sha256sum] = "f7f91842056a7cf680b0eaf8cefc5e46c69e2521e651128d2e6aaaccec8652ae" 76SRC_URI[sha256sum] = "a1d1268d200816bfb9727a7a27b78d8e37ecec2e4d5ebd33eb64e2789e0db43e"
75 77
76# install what is needed for numpy.test() 78# install what is needed for numpy.test()
77RDEPENDS_${PN} = "python3-unittest \ 79RDEPENDS_${PN} = "python3-unittest \
@@ -94,6 +96,7 @@ RDEPENDS_${PN} = "python3-unittest \
94 python3-compression \ 96 python3-compression \
95 python3-ctypes \ 97 python3-ctypes \
96 python3-threading \ 98 python3-threading \
99 python3-textutils \
97" 100"
98 101
99RDEPENDS_${PN}_class-native = "" 102RDEPENDS_${PN}_class-native = ""