| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | This fixes the numpy import problem in setupext.py using a hard-coded path. |
| 2 | |
| 3 | Index: matplotlib-1.1.0/setupext.py |
| 4 | =================================================================== |
| 5 | --- matplotlib-1.1.0.orig/setupext.py |
| 6 | +++ matplotlib-1.1.0/setupext.py |
| 7 | @@ -122,8 +122,8 @@ numpy_inc_dirs = [] |
| 8 | # matplotlib build options, which can be altered using setup.cfg |
| 9 | options = {'display_status': True, |
| 10 | 'verbose': False, |
| 11 | - 'provide_pytz': 'auto', |
| 12 | - 'provide_dateutil': 'auto', |
| 13 | + 'provide_pytz': False, |
| 14 | + 'provide_dateutil': False, |
| 15 | 'build_agg': True, |
| 16 | 'build_gtk': 'auto', |
| 17 | 'build_gtkagg': 'auto', |
| 18 | @@ -176,10 +176,7 @@ if os.path.exists(setup_cfg): |
| 19 | except: pass |
| 20 | |
| 21 | # For get_base_flags: |
| 22 | -if options['basedirlist']: |
| 23 | - basedirlist = options['basedirlist'].split() |
| 24 | -else: |
| 25 | - basedirlist = basedir[sys.platform] |
| 26 | +basedirlist = [os.environ['STAGING_LIBDIR']] |
| 27 | print("basedirlist is: %s" % basedirlist) |
| 28 | |
| 29 | if options['display_status']: |
| 30 | @@ -555,8 +552,8 @@ def check_for_numpy(): |
| 31 | |
| 32 | def add_numpy_flags(module): |
| 33 | "Add the modules flags to build extensions which use numpy" |
| 34 | - import numpy |
| 35 | - module.include_dirs.append(numpy.get_include()) |
| 36 | + # Hard-coded path for OE since I know this is where numpy's include dir will be |
| 37 | + module.include_dirs.append(os.path.join(os.environ['STAGING_LIBDIR'], 'python2.7/site-packages/numpy/core/include/')) |
| 38 | |
| 39 | def add_png_flags(module): |
| 40 | try_pkgconfig(module, 'libpng', 'png') |