55 lines
1.8 KiB
Diff
55 lines
1.8 KiB
Diff
From af70de7feda043e45d150aadb6cedbc67c925e47 Mon Sep 17 00:00:00 2001
|
|
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
|
Date: Mon, 23 May 2022 02:42:38 -0400
|
|
Subject: [PATCH 3/3] Remove extraneous insertion of default compiler paths
|
|
|
|
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
|
---
|
|
setup.py | 14 ++------------
|
|
1 file changed, 2 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index 2bd3b5f3..92a70a68 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -30,7 +30,6 @@ import shutil
|
|
import subprocess
|
|
import warnings
|
|
from collections import defaultdict
|
|
-from sysconfig import get_config_var
|
|
|
|
from setuptools import Command, Extension, convert_path, setup
|
|
|
|
@@ -250,16 +249,7 @@ install_requires = extras_require.pop('default')
|
|
tests_require = extras_require.get('tests', [])
|
|
|
|
# General extension paths
|
|
-if sys.platform.startswith('win'):
|
|
- def get_config_var(name):
|
|
- return '.'
|
|
-include_dir = get_config_var('INCLUDEDIR')
|
|
-library_dir = get_config_var('LIBDIR')
|
|
extra_extension_args = defaultdict(list)
|
|
-if not sys.platform.startswith('win'):
|
|
- extra_extension_args["runtime_library_dirs"].append(
|
|
- get_config_var('LIBDIR')
|
|
- )
|
|
|
|
# Description
|
|
# ===========
|
|
@@ -277,10 +267,10 @@ extensions = [
|
|
Extension(
|
|
'cartopy.trace',
|
|
['lib/cartopy/trace.pyx'],
|
|
- include_dirs=([include_dir, './lib/cartopy', np.get_include()] +
|
|
+ include_dirs=(['./lib/cartopy', np.get_include()] +
|
|
proj_includes + geos_includes),
|
|
libraries=proj_libraries + geos_libraries,
|
|
- library_dirs=[library_dir] + proj_library_dirs + geos_library_dirs,
|
|
+ library_dirs=proj_library_dirs + geos_library_dirs,
|
|
language='c++',
|
|
**extra_extension_args),
|
|
]
|
|
--
|
|
2.35.1
|
|
|