69 lines
3.6 KiB
Diff
69 lines
3.6 KiB
Diff
diff -uNr uwsgi-2.0.25.1/uwsgiconfig.py uwsgi-2.0.25.1.mod/uwsgiconfig.py
|
|
--- uwsgi-2.0.25.1/uwsgiconfig.py 2024-04-15 22:43:55.000000000 +0300
|
|
+++ uwsgi-2.0.25.1.mod/uwsgiconfig.py 2024-04-17 14:08:43.743475152 +0300
|
|
@@ -730,7 +730,7 @@
|
|
if not self.include_path:
|
|
raise
|
|
except:
|
|
- self.include_path = ['/usr/include', '/usr/local/include']
|
|
+ self.include_path = []
|
|
|
|
additional_include_paths = self.get('additional_include_paths')
|
|
if additional_include_paths:
|
|
@@ -1085,13 +1085,13 @@
|
|
|
|
required_pcre = self.get('pcre')
|
|
if required_pcre:
|
|
- pcre_libs = spcall('pcre2-config --libs8')
|
|
+ pcre_libs = spcall('sh @TERMUX_PREFIX@/bin/pcre2-config --libs')
|
|
if pcre_libs:
|
|
- pcre_cflags = spcall("pcre2-config --cflags")
|
|
+ pcre_cflags = spcall("sh @TERMUX_PREFIX@/bin/pcre2-config --cflags")
|
|
pcre_define = "-DUWSGI_PCRE2"
|
|
else:
|
|
- pcre_libs = spcall('pcre-config --libs')
|
|
- pcre_cflags = spcall("pcre-config --cflags")
|
|
+ pcre_libs = spcall('sh @TERMUX_PREFIX@/bin/pcre-config --libs')
|
|
+ pcre_cflags = spcall("sh @TERMUX_PREFIX@/bin/pcre-config --cflags")
|
|
pcre_define = "-DUWSGI_PCRE"
|
|
else:
|
|
pcre_libs = None
|
|
@@ -1130,7 +1130,7 @@
|
|
|
|
if self.has_include('uuid/uuid.h'):
|
|
self.cflags.append("-DUWSGI_UUID")
|
|
- if uwsgi_os in ('Linux', 'GNU', 'GNU/kFreeBSD') or uwsgi_os.startswith('CYGWIN') or os.path.exists('/usr/lib/libuuid.so') or os.path.exists('/usr/local/lib/libuuid.so') or os.path.exists('/usr/lib64/libuuid.so') or os.path.exists('/usr/local/lib64/libuuid.so'):
|
|
+ if uwsgi_os in ('Linux', 'GNU', 'GNU/kFreeBSD') or uwsgi_os.startswith('CYGWIN') or os.path.exists('@TERMUX_PREFIX@/lib/libuuid.so'):
|
|
self.libs.append('-luuid')
|
|
|
|
if self.get('append_version'):
|
|
@@ -1315,10 +1315,10 @@
|
|
|
|
if self.get('xml'):
|
|
if self.get('xml') == 'auto':
|
|
- xmlconf = spcall('xml2-config --libs')
|
|
+ xmlconf = spcall('sh @TERMUX_PREFIX@/bin/xml2-config --libs')
|
|
if xmlconf and uwsgi_os != 'Darwin':
|
|
self.libs.append(xmlconf)
|
|
- xmlconf = spcall("xml2-config --cflags")
|
|
+ xmlconf = spcall("sh @TERMUX_PREFIX@/bin/xml2-config --cflags")
|
|
self.cflags.append(xmlconf)
|
|
self.cflags.append("-DUWSGI_XML -DUWSGI_XML_LIBXML2")
|
|
self.gcc_list.append('core/xmlconf')
|
|
@@ -1329,13 +1329,13 @@
|
|
self.gcc_list.append('core/xmlconf')
|
|
report['xml'] = 'expat'
|
|
elif self.get('xml') == 'libxml2':
|
|
- xmlconf = spcall('xml2-config --libs')
|
|
+ xmlconf = spcall('sh @TERMUX_PREFIX@/bin/xml2-config --libs')
|
|
if xmlconf is None:
|
|
print("*** libxml2 headers unavailable. uWSGI build is interrupted. You have to install libxml2 development package or use libexpat or disable XML")
|
|
sys.exit(1)
|
|
else:
|
|
self.libs.append(xmlconf)
|
|
- xmlconf = spcall("xml2-config --cflags")
|
|
+ xmlconf = spcall("sh @TERMUX_PREFIX@/bin/xml2-config --cflags")
|
|
if xmlconf is None:
|
|
print("*** libxml2 headers unavailable. uWSGI build is interrupted. You have to install libxml2 development package or use libexpat or disable XML")
|
|
sys.exit(1)
|