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>
This commit is contained in:
Tim Orling
2014-07-15 16:32:34 -07:00
committed by Martin Jansa
parent ed634d36d6
commit a6d7ba9264
37 changed files with 1 additions and 0 deletions

View File

@@ -0,0 +1,29 @@
This fixes the dependency checks inside of setup.py since things like
'import numpy' won't work with bitbake.
diff --git a/setup.py b/setup.py
index 2f13821..e6d6ed0 100644
--- a/setup.py
+++ b/setup.py
@@ -113,12 +113,6 @@ if 1:
baseline_images = [chop_package(f) for f in baseline_images]
package_data['matplotlib'].extend(baseline_images)
-if not check_for_numpy():
- sys.exit(1)
-
-if not check_for_freetype():
- sys.exit(1)
-
build_ft2font(ext_modules, packages)
build_ttconv(ext_modules, packages)
build_contour(ext_modules, packages)
@@ -129,7 +123,7 @@ build_tri(ext_modules, packages)
print_raw("")
print_raw("OPTIONAL BACKEND DEPENDENCIES")
-has_libpng = check_for_libpng()
+has_libpng = True
if has_libpng and options['build_agg']:
build_agg(ext_modules, packages)

View File

@@ -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')