VladPolskiy/mariadb-connector-python
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-python.git synced 2025-07-27 13:01:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Read plugin directory from mariadb_config.

Browse Source
This commit is contained in:
Georg Richter
2019-12-04 08:40:16 +01:00
parent e218d19060
commit 13aa2178d9
2 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
.gitignore vendored
View File

@ -1,32 +1,18 @@
# Prerequisites # Keep empty directories:
*.d # Keep empty directories: >> .gitignore/.git*
# Object files # Compiled Static libraries
*.o
*.ko
*.obj
*.elf
# Linker output
*.ilk
*.map
*.exp
# Precompiled Headers
*.gch
*.pch
# Libraries
*.lib *.lib
*.a *.a
*.la *.la
*.lai
*.lo *.lo
# Shared objects (inc. Windows DLLs) # Compiled Dynamic libraries
*.dll
*.so *.so
*.so.* *.so.*
*.dylib *.dylib
*.dll
# Executables # Executables
*.exe *.exe
@ -36,18 +22,24 @@
*.x86_64 *.x86_64
*.hex *.hex
# Debug files *.dgcov
*.dSYM/ .*.swp
*.su .gdb_history
*.idb
*.pdb
# Kernel Module Compile Results #VS files/directories
*.mod* *.vcxproj
*.cmd *.filters
.tmp_versions/ *.user
modules.order ipch
Module.symvers *.sln
Mkfile.old *.suo
dkms.conf *.sdf
client.cnf Win32
x64
*.dir
Debug
Release
RelWithDebInfo
#vim backups
*.*~

2
mariadb_posix.py
View File

@ -54,6 +54,7 @@ def get_config(options):
cfg = MariaDBConfiguration() cfg = MariaDBConfiguration()
cfg.version = cc_version[0] cfg.version = cc_version[0]
plugindir= mariadb_config(config_prg, "plugindir")
libs = mariadb_config(config_prg, "libs") libs = mariadb_config(config_prg, "libs")
extra_libs= mariadb_config(config_prg, "libs_sys") extra_libs= mariadb_config(config_prg, "libs_sys")
cfg.lib_dirs = [dequote(i[2:]) for i in libs if i.startswith("-L")] cfg.lib_dirs = [dequote(i[2:]) for i in libs if i.startswith("-L")]
@ -67,4 +68,5 @@ def get_config(options):
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 = [dequote(i[2:]) for i in extra_libs if i.startswith("-l")] cfg.libs = [dequote(i[2:]) for i in extra_libs if i.startswith("-l")]
cfg.includes = mariadb_includes cfg.includes = mariadb_includes
cfg.extra_compile_args= ["-DDEFAULT_PLUGINS_SUBDIR=\"%s\"" % plugindir[0]]
return cfg return cfg