mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-22 09:57:41 +00:00
Code Issues Releases Wiki Activity

[#3731] Revert mysql fallback to cflags

Browse Source 
Since mariadb_config does not have --cxxflags.
This commit is contained in:
Andrei Pavel 2025-03-14 14:17:17 +02:00
parent 8591bf699c
commit 2ab3a0119f
No known key found for this signature in database
GPG Key ID: D4E804481939CB21
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
subprojects/mysql/meson.build
View File

@ -8,12 +8,12 @@ foreach mysql_config_file : ['mariadb_config', 'mysql_config']
if not mysql_config.found() if not mysql_config.found()
continue continue
endif endif
cxxflags = run_command([mysql_config, '--cxxflags'], check: false) cflags = run_command([mysql_config, '--cflags'], check: false)
libs = run_command([mysql_config, '--libs'], check: false) libs = run_command([mysql_config, '--libs'], check: false)
version = run_command([mysql_config, '--version'], check: false) version = run_command([mysql_config, '--version'], check: false)
if cxxflags.returncode() == 0 and libs.returncode() == 0 and version.returncode() == 0 if cflags.returncode() == 0 and libs.returncode() == 0 and version.returncode() == 0
mysql_compile_args = cxxflags.stdout().split() mysql_compile_args = cflags.stdout().split()
mysql_link_args = libs.stdout().split() mysql_link_args = libs.stdout().split()
mysql_version = version.stdout().strip() mysql_version = version.stdout().strip()
mysql = declare_dependency( mysql = declare_dependency(