diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-07-22 13:34:41 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-07-30 12:49:45 +0200 |
| commit | d22f4ca2e3e421615b601002061690a8f97257c0 (patch) | |
| tree | 8cfee5bd859365868dc3cb5eb9ba91d9713efb79 /meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch | |
| parent | 2d7c7956bd3655755e1e800b7b05732f0c1a3786 (diff) | |
| download | meta-openembedded-contrib-d22f4ca2e3e421615b601002061690a8f97257c0.tar.gz | |
meta-python: rename recipes-python to recipes-devtools
* match old structure from meta-oe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch')
| -rw-r--r-- | meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch b/meta-python/recipes-devtools/python/python-matplotlib/fix_setupext.patch new file mode 100644 index 0000000000..e07159552f --- /dev/null +++ b/meta-python/recipes-devtools/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') |