VladPolskiy/mariadb-connector-python
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-python.git synced 2025-08-06 18:19:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[misc] using mariadb_config from configuration, or if not defined from path

Browse Source
This commit is contained in:
rusher
2019-11-27 14:07:28 +01:00
parent 25a522f9d7
commit 6daefe02ba
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mariadb_posix.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/env python #!/usr/bin/env python
import os import subprocess
import sys import sys
@ -39,13 +39,17 @@ def get_config(options):
no_env = 0 no_env = 0
static = options["link_static"] static = options["link_static"]
try:
config_prg= options["mariadb_config"] config_prg = options["mariadb_config"]
subprocess.call([config_prg, "--version"])
except FileNotFoundError:
# using default from path
config_prg = "mariadb_config"
cc_version = mariadb_config(config_prg, "cc_version") cc_version = mariadb_config(config_prg, "cc_version")
if cc_version[0] < required_version: if cc_version[0] < required_version:
print ('MariaDB Connector/Python requires MariaDB Connector/C >= %s, found version %s' % ( print ('MariaDB Connector/Python requires MariaDB Connector/C >= %s, found version %s' % (
required_version, cc_version[0])) required_version, cc_version[0]))
sys.exit(2) sys.exit(2)
cfg = MariaDBConfiguration() cfg = MariaDBConfiguration()
cfg.version = cc_version[0] cfg.version = cc_version[0]
@ -58,7 +62,7 @@ def get_config(options):
mariadb_includes = [dequote(i[2:]) for i in includes if i.startswith("-I")] mariadb_includes = [dequote(i[2:]) for i in includes if i.startswith("-I")]
mariadb_includes.extend(["./include"]) mariadb_includes.extend(["./include"])
if static: if static:
cfg.extra_objects = ['{}/lib{}.a'.format(cfg.lib_dirs[0], l) for l in ["mariadbclient"]] cfg.extra_objects = ['{}/lib{}.a'.format(cfg.lib_dirs[0], l) for l in ["mariadbclient"]]
cfg.libs = [] cfg.libs = []
cfg.includes = mariadb_includes cfg.includes = mariadb_includes
return cfg return cfg