diff options
author | Tim Orling <ticotimo@gmail.com> | 2014-10-12 22:02:22 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-14 11:48:58 +0200 |
commit | fd1c5b8dc5c9f412036f0356cc2036803d0a41c1 (patch) | |
tree | 7d45a0589cd77bf9e815181742356400e450b94a /meta-python/recipes-devtools/python/python-matplotlib_1.1.0.bb | |
parent | 19692ba37a82253fa8d2922f9c8fc716bd12734e (diff) | |
download | meta-openembedded-fd1c5b8dc5c9f412036f0356cc2036803d0a41c1.tar.gz |
python-matplotlib: add dateutil & pytz to DEPENDS/RDEPENDS
python-matplotlib is currently providing its own dateutil and pytz
Add dateutil and pytz as DEPENDS/RDEPENDS.
Patch setupext.py to no longer provide its own dateutil and pytz.
Remove python-matplotlib from blacklist.
Signed-off-by: Tim Orling <TicoTimo@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-python/recipes-devtools/python/python-matplotlib_1.1.0.bb')
-rw-r--r-- | meta-python/recipes-devtools/python/python-matplotlib_1.1.0.bb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/meta-python/recipes-devtools/python/python-matplotlib_1.1.0.bb b/meta-python/recipes-devtools/python/python-matplotlib_1.1.0.bb index 6c8a202c5..69f71c711 100644 --- a/meta-python/recipes-devtools/python/python-matplotlib_1.1.0.bb +++ b/meta-python/recipes-devtools/python/python-matplotlib_1.1.0.bb | |||
@@ -4,11 +4,8 @@ LICENSE = "PSF" | |||
4 | LIC_FILES_CHKSUM = "file://README.txt;md5=83c5bf8b16a5f99507f2f47a21ae3b81" | 4 | LIC_FILES_CHKSUM = "file://README.txt;md5=83c5bf8b16a5f99507f2f47a21ae3b81" |
5 | PR = "r1" | 5 | PR = "r1" |
6 | 6 | ||
7 | DEPENDS += "python-numpy freetype libpng" | 7 | DEPENDS += "python-numpy freetype libpng python-dateutil python-pytz" |
8 | RDEPENDS_${PN} = "python-core python-distutils python-numpy freetype libpng" | 8 | RDEPENDS_${PN} = "python-core python-distutils python-numpy freetype libpng python-dateutil python-pytz" |
9 | |||
10 | PNBLACKLIST[python-matplotlib] = "CONFLICT: 34 files with python-dateutil" | ||
11 | # e.g. sysroots/qemux86-64/usr/lib/python2.7/site-packages/dateutil/tzwin.pyc | ||
12 | 9 | ||
13 | SRC_URI = "${SOURCEFORGE_MIRROR}/matplotlib/matplotlib-${PV}.tar.gz \ | 10 | SRC_URI = "${SOURCEFORGE_MIRROR}/matplotlib/matplotlib-${PV}.tar.gz \ |
14 | file://fix_setup.patch \ | 11 | file://fix_setup.patch \ |