mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-07 05:10:20 +00:00
Code Issues Projects Releases Wiki Activity

python-matplotlib: add dateutil & pytz to DEPENDS/RDEPENDS

Browse Source 
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>
This commit is contained in:
Tim Orling
2014-10-12 22:02:22 -07:00
committed by Martin Jansa
parent 19692ba37a
commit fd1c5b8dc5
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch
+15 -4
View File
@@ -1,9 +1,20 @@
This fixes the numpy import problem in setupext.py using a hard-coded path. This fixes the numpy import problem in setupext.py using a hard-coded path.
diff --git a/setupext.py b/setupext.py Index: matplotlib-1.1.0/setupext.py
index 962cedc..82297c4 100644 ===================================================================
--- a/setupext.py --- matplotlib-1.1.0.orig/setupext.py
+++ b/setupext.py +++ matplotlib-1.1.0/setupext.py
@@ -122,8 +122,8 @@ numpy_inc_dirs = []
# matplotlib build options, which can be altered using setup.cfg
options = {'display_status': True,
'verbose': False,
- 'provide_pytz': 'auto',
- 'provide_dateutil': 'auto',
+ 'provide_pytz': False,
+ 'provide_dateutil': False,
'build_agg': True,
'build_gtk': 'auto',
'build_gtkagg': 'auto',
@@ -176,10 +176,7 @@ if os.path.exists(setup_cfg): @@ -176,10 +176,7 @@ if os.path.exists(setup_cfg):
except: pass except: pass
meta-python/recipes-devtools/python/python-matplotlib_1.1.0.bb
+2 -5
View File
@@ -4,11 +4,8 @@ LICENSE = "PSF"
LIC_FILES_CHKSUM = "file://README.txt;md5=83c5bf8b16a5f99507f2f47a21ae3b81" LIC_FILES_CHKSUM = "file://README.txt;md5=83c5bf8b16a5f99507f2f47a21ae3b81"
PR = "r1" PR = "r1"
DEPENDS += "python-numpy freetype libpng" DEPENDS += "python-numpy freetype libpng python-dateutil python-pytz"
RDEPENDS_${PN} = "python-core python-distutils python-numpy freetype libpng" RDEPENDS_${PN} = "python-core python-distutils python-numpy freetype libpng python-dateutil python-pytz"
PNBLACKLIST[python-matplotlib] = "CONFLICT: 34 files with python-dateutil"
# e.g. sysroots/qemux86-64/usr/lib/python2.7/site-packages/dateutil/tzwin.pyc
SRC_URI = "${SOURCEFORGE_MIRROR}/matplotlib/matplotlib-${PV}.tar.gz \ SRC_URI = "${SOURCEFORGE_MIRROR}/matplotlib/matplotlib-${PV}.tar.gz \
file://fix_setup.patch \ file://fix_setup.patch \