use distutils if it's available

unbit · Oct 4, 2023 · 6f1eb19 · 6f1eb19
1 parent 8041fc2
commit 6f1eb19
Show file tree

Hide file tree

Showing 7 changed files with 97 additions and 28 deletions.
diff --git a/plugins/asyncio/uwsgiplugin.py b/plugins/asyncio/uwsgiplugin.py
@@ -1,11 +1,21 @@
+import os
 import sysconfig
 
+try:
+    from distutils import sysconfig as legacy
+except ImportError:
+    legacy = None
+
+def get_includes():
+    yield sysconfig.get_path('include')
+    yield sysconfig.get_path('platinclude')
+    if legacy:
+        yield sysconfig.get_python_inc()
+        yield sysconfig.get_python_inc(plat_specific=True)
+
 NAME = 'asyncio'
 
-CFLAGS = [
-    '-I' + sysconfig.get_path('include'),
-    '-I' + sysconfig.get_path('platinclude')
-]
+CFLAGS = ['-I' + i for i in filter(os.path.exists, get_includes())]
 LDFLAGS = []
 LIBS = []
 GCC_LIST = ['asyncio']
diff --git a/plugins/gevent/uwsgiplugin.py b/plugins/gevent/uwsgiplugin.py
@@ -1,11 +1,22 @@
+import os
 import sysconfig
 
+try:
+    from distutils import sysconfig as legacy
+except ImportError:
+    legacy = None
+
+def get_includes():
+    yield sysconfig.get_path('include')
+    yield sysconfig.get_path('platinclude')
+    if legacy:
+        yield sysconfig.get_python_inc()
+        yield sysconfig.get_python_inc(plat_specific=True)
+
+
 NAME = 'gevent'
 
-CFLAGS = [
-    '-I' + sysconfig.get_path('include'),
-    '-I' + sysconfig.get_path('platinclude')
-]
+CFLAGS = ['-I' + i for i in filter(os.path.exists, get_includes())]
 LDFLAGS = []
 LIBS = []
 

diff --git a/plugins/greenlet/uwsgiplugin.py b/plugins/greenlet/uwsgiplugin.py
@@ -1,11 +1,21 @@
+import os
 import sysconfig
 
+try:
+    from distutils import sysconfig as legacy
+except ImportError:
+    legacy = None
+
+def get_includes():
+    yield sysconfig.get_path('include')
+    yield sysconfig.get_path('platinclude')
+    if legacy:
+        yield sysconfig.get_python_inc()
+        yield sysconfig.get_python_inc(plat_specific=True)
+
 NAME = 'greenlet'
 
-CFLAGS = [
-    '-I' + sysconfig.get_path('include'),
-    '-I' + sysconfig.get_path('platinclude')
-]
+CFLAGS = ['-I' + i for i in filter(os.path.exists, get_includes())]
 LDFLAGS = []
 LIBS = []
 

diff --git a/plugins/python/uwsgiplugin.py b/plugins/python/uwsgiplugin.py
@@ -3,6 +3,18 @@
 
 import sysconfig
 
+try:
+    from distutils import sysconfig as legacy
+except ImportError:
+    legacy = None
+
+def get_includes():
+    yield sysconfig.get_path('include')
+    yield sysconfig.get_path('platinclude')
+    if legacy:
+        yield sysconfig.get_python_inc()
+        yield sysconfig.get_python_inc(plat_specific=True)
+
 
 def get_python_version():
     version = sysconfig.get_config_var('VERSION')
@@ -30,10 +42,7 @@ def get_python_version():
     'raw'
 ]
 
-CFLAGS = [
-    '-I' + sysconfig.get_path('include'),
-    '-I' + sysconfig.get_path('platinclude'),
-]
+CFLAGS = ['-I' + i for i in filter(os.path.exists, get_includes())]
 LDFLAGS = []
 
 if 'UWSGI_PYTHON_NOLIB' not in os.environ:

diff --git a/plugins/pyuwsgi/uwsgiplugin.py b/plugins/pyuwsgi/uwsgiplugin.py
@@ -1,14 +1,23 @@
 import sysconfig
 import os, sys
 
+try:
+    from distutils import sysconfig as legacy
+except ImportError:
+    legacy = None
+
+def get_includes():
+    yield sysconfig.get_path('include')
+    yield sysconfig.get_path('platinclude')
+    if legacy:
+        yield sysconfig.get_python_inc()
+        yield sysconfig.get_python_inc(plat_specific=True)
+
 os.environ['UWSGI_PYTHON_NOLIB'] = '1'
 
 NAME = 'pyuwsgi'
 
-CFLAGS = [
-    '-I' + sysconfig.get_path('include'),
-    '-I' + sysconfig.get_path('platinclude'),
-]
+CFLAGS = ['-I' + i for i in filter(os.path.exists, get_includes())]
 LDFLAGS = []
 LIBS = []
 

diff --git a/plugins/stackless/uwsgiplugin.py b/plugins/stackless/uwsgiplugin.py
@@ -1,11 +1,21 @@
+import os
 import sysconfig
 
+try:
+    from distutils import sysconfig as legacy
+except ImportError:
+    legacy = None
+
+def get_includes():
+    yield sysconfig.get_path('include')
+    yield sysconfig.get_path('platinclude')
+    if legacy:
+        yield sysconfig.get_python_inc()
+        yield sysconfig.get_python_inc(plat_specific=True)
+
 NAME = 'stackless'
 
-CFLAGS = [
-    '-I' + sysconfig.get_path('include'),
-    '-I' + sysconfig.get_path('platinclude'),
-]
+CFLAGS = ['-I' + i for i in filter(os.path.exists, get_includes())]
 LDFLAGS = []
 LIBS = []
 

diff --git a/plugins/tornado/uwsgiplugin.py b/plugins/tornado/uwsgiplugin.py
@@ -1,11 +1,21 @@
+import os
 import sysconfig
 
+try:
+    from distutils import sysconfig as legacy
+except ImportError:
+    legacy = None
+
+def get_includes():
+    yield sysconfig.get_path('include')
+    yield sysconfig.get_path('platinclude')
+    if legacy:
+        yield sysconfig.get_python_inc()
+        yield sysconfig.get_python_inc(plat_specific=True)
+
 NAME = 'tornado'
 
-CFLAGS = [
-    '-I' + sysconfig.get_path('include'),
-    '-I' + sysconfig.get_path('platinclude'),
-]
+CFLAGS = ['-I' + i for i in filter(os.path.exists, get_includes())]
 LDFLAGS = []
 LIBS = []