diff options
| -rw-r--r-- | numpy/distutils/misc_util.py | 6 | ||||
| -rw-r--r-- | numpy/distutils/npy_pkg_config.py | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py index 218d14011..1fe482801 100644 --- a/numpy/distutils/misc_util.py +++ b/numpy/distutils/misc_util.py @@ -1572,6 +1572,12 @@ def get_info(pkgname): info = parse_flags(pkg_info.cflags()) for k, v in parse_flags(pkg_info.libs()).items(): info[k].extend(v) + + # add_extension extra_info argument is ANAL + info['define_macros'] = info['macros'] + del info['macros'] + del info['ignored'] + return info def is_bootstrapping(): diff --git a/numpy/distutils/npy_pkg_config.py b/numpy/distutils/npy_pkg_config.py index 616fdaddb..346a4f981 100644 --- a/numpy/distutils/npy_pkg_config.py +++ b/numpy/distutils/npy_pkg_config.py @@ -26,8 +26,8 @@ def parse_flags(line): lexer = shlex.shlex(line) lexer.whitespace_split = True - d = {'include_dirs': [], 'library_dirs': [], 'libs': [], 'include': [], - 'macros': [], 'libs': [], 'ignored': []} + d = {'include_dirs': [], 'library_dirs': [], 'libraries': [], + 'macros': [], 'ignored': []} def next_token(t): if t.startswith('-I'): if len(t) > 2: @@ -42,7 +42,7 @@ def parse_flags(line): t = lexer.get_token() d['library_dirs'].append(t) elif t.startswith('-l'): - d['libs'].append(t[2:]) + d['libraries'].append(t[2:]) elif t.startswith('-D'): d['macros'].append(t[2:]) else: |