aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools/python/python-matplotlib/fix_setupext.patch
diff options
context:
space:
mode:
authorTim Orling <ticotimo@gmail.com>2014-07-15 16:32:34 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2014-07-22 00:01:49 +0200
commita6d7ba92645a112af358efd94ff3aa0c74985a51 (patch)
tree6232bed0de0d30933326525b24e21ca8e4965237 /meta-oe/recipes-devtools/python/python-matplotlib/fix_setupext.patch
parented634d36d64af846b68424d38eaa86b464584840 (diff)
downloadmeta-openembedded-contrib-a6d7ba92645a112af358efd94ff3aa0c74985a51.tar.gz
meta-python: move recipes from meta-oe
* 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> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/python/python-matplotlib/fix_setupext.patch')
-rw-r--r--meta-oe/recipes-devtools/python/python-matplotlib/fix_setupext.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/meta-oe/recipes-devtools/python/python-matplotlib/fix_setupext.patch b/meta-oe/recipes-devtools/python/python-matplotlib/fix_setupext.patch
deleted file mode 100644
index e07159552f..0000000000
--- a/meta-oe/recipes-devtools/python/python-matplotlib/fix_setupext.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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')