From b48b7b4109868a8c0ddda090992e936e821c7ea6 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 17 Aug 2016 15:04:38 -0500 Subject: Squashed 'import-layers/meta-openembedded/' content from commit 247b126 Change-Id: I40827e9ce5fba63f1cca2a0be44976ae8383b4c0 git-subtree-dir: import-layers/meta-openembedded git-subtree-split: 247b1267bbe95719cd4877d2d3cfbaf2a2f4865a Signed-off-by: Patrick Williams --- .../python/python-matplotlib/fix_setup.patch | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-matplotlib/fix_setup.patch (limited to 'import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-matplotlib/fix_setup.patch') diff --git a/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-matplotlib/fix_setup.patch b/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-matplotlib/fix_setup.patch new file mode 100644 index 000000000..938158353 --- /dev/null +++ b/import-layers/meta-openembedded/meta-python/recipes-devtools/python/python-matplotlib/fix_setup.patch @@ -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) -- cgit v1.2.3