diff options
| author |   Tim Orling <TicoTimo@gmail.com> | 2014-07-15 15:42:55 -0700 |
|---|---|---|
| committer | Tim Orling <TicoTimo@gmail.com> | 2014-07-15 15:42:55 -0700 |
| commit | a6acceb1dc1d391e20c3722e685aa7c9cca313b3 (patch) | |
| tree | c31a773a177c030ed638252f99755c9be8ec9c12 /meta-python/recipes-python/python-matplotlib/fix_setupext.patch | |
| parent | df9ed3b72b1920938e4c79c20cdd288a1d7b16a8 (diff) | |
| download | meta-openembedded-contrib-a6acceb1dc1d391e20c3722e685aa7c9cca313b3.tar.gz | |
meta-python: move recipes from meta-oetimo/meta-python
* Move recipes from meta-openembedded/meta-oe that are not
depended upon by recipes already in meta-oe (e.g. gateone,
anki)
* Recipes NOT moved:
python-futures
python-pyopenssl
python-simplejson
python-tornado
python-pyqt
python-sip
Signed-off-by: Tim Orling <TicoTimo@gmail.com>
Diffstat (limited to 'meta-python/recipes-python/python-matplotlib/fix_setupext.patch')
| -rw-r--r-- | meta-python/recipes-python/python-matplotlib/fix_setupext.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta-python/recipes-python/python-matplotlib/fix_setupext.patch b/meta-python/recipes-python/python-matplotlib/fix_setupext.patch new file mode 100644 index 0000000000..e07159552f --- /dev/null +++ b/meta-python/recipes-python/python-matplotlib/fix_setupext.patch @@ -0,0 +1,29 @@ +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 +@@ -176,10 +176,7 @@ if os.path.exists(setup_cfg): + except: pass + + # For get_base_flags: +-if options['basedirlist']: +- basedirlist = options['basedirlist'].split() +-else: +- basedirlist = basedir[sys.platform] ++basedirlist = [os.environ['STAGING_LIBDIR']] + print("basedirlist is: %s" % basedirlist) + + if options['display_status']: +@@ -555,8 +552,8 @@ def check_for_numpy(): + + def add_numpy_flags(module): + "Add the modules flags to build extensions which use numpy" +- import numpy +- module.include_dirs.append(numpy.get_include()) ++ # Hard-coded path for OE since I know this is where numpy's include dir will be ++ module.include_dirs.append(os.path.join(os.environ['STAGING_LIBDIR'], 'python2.7/site-packages/numpy/core/include/')) + + def add_png_flags(module): + try_pkgconfig(module, 'libpng', 'png') |