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 | 44ecb3f307ff2b2328331cb87d295864a133b5b9 (patch) | |
| tree | 21d7a7103b05cf23a2fd7a082fc38235139e47e7 /recipes-devtools/python/python-matplotlib | |
| parent | ee69d73b0d52661dd754ac02addd78fed1c26537 (diff) | |
| download | meta-python2-44ecb3f307ff2b2328331cb87d295864a133b5b9.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.
(From meta-openembedded commit: fd1c5b8dc5c9f412036f0356cc2036803d0a41c1)
Signed-off-by: Tim Orling <TicoTimo@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Tim Orling <ticotimo@gmail.com>
Diffstat (limited to 'recipes-devtools/python/python-matplotlib')
| -rw-r--r-- | recipes-devtools/python/python-matplotlib/fix_setupext.patch | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/recipes-devtools/python/python-matplotlib/fix_setupext.patch b/recipes-devtools/python/python-matplotlib/fix_setupext.patch index e071595..9a13a18 100644 --- a/recipes-devtools/python/python-matplotlib/fix_setupext.patch +++ b/recipes-devtools/python/python-matplotlib/fix_setupext.patch @@ -1,9 +1,20 @@ This fixes the numpy import problem in setupext.py using a hard-coded path. -diff --git a/setupext.py b/setupext.py -index 962cedc..82297c4 100644 ---- a/setupext.py -+++ b/setupext.py +Index: matplotlib-1.1.0/setupext.py +=================================================================== +--- matplotlib-1.1.0.orig/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): except: pass |