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

[#3729] Improved config report

Browse Source
This commit is contained in:
Francis Dupont
2025-02-09 01:43:13 +01:00
committed by Andrei Pavel
parent d52df047b8
commit 0725367459
2 changed files with 141 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
config-report.sh.in
View File

@@ -17,16 +17,23 @@ Package:
Hooks directory: @HOOKS_DIR@ Hooks directory: @HOOKS_DIR@
Premium hooks: @PREMIUM@ Premium hooks: @PREMIUM@
Build Options: @BUILD_OPTIONS@
Meson Version: @MESON_VERSION@
C++ Compiler: C++ Compiler:
CXX: @CXX@ CXX: @CXX@
CXX_ID: @CXX_ID@ CXX_ID: @CXX_ID@
CXX_VERSION: @CXX_VERSION@ CXX_VERSION: @CXX_VERSION@
CXX_STANDARD: @CXX_STANDARD@ CXX_STANDARD: @CXX_STANDARD@
CXX_ARGS: @CXX_ARGS@
LD_ID: @LD_ID@
LD_ARGS: @LD_ARGS@
END END
if test "@HAVE_PYTHON@" != "no" ; then if test "@HAVE_PYTHON@" != "no" ; then
cat >> @TOP_BUILD_DIR@/config.report << END cat >> @TOP_BUILD_DIR@/config.report << END
Python: Python:
PYTHON: @PYTHON_PATH@ PYTHON: @PYTHON_PATH@
PKGPYTHONDIR: @PKGPYTHONDIR@ PKGPYTHONDIR: @PKGPYTHONDIR@
@@ -37,80 +44,75 @@ fi
cat >> @TOP_BUILD_DIR@/config.report << END cat >> @TOP_BUILD_DIR@/config.report << END
Boost: Boost:
BOOST_VERSION: @BOOST_VERSION@ BOOST_VERSION: @BOOST_VERSION@
BOOST_CFLAGS: @BOOST_CFLAGS@ BOOST_INCLUDE: @BOOST_INCLUDE@
BOOST_LIBS: @BOOST_LIBS@ BOOST_LIBDIR: @BOOST_LIBDIR@
@CRYPTO_NAME@: @CRYPTO_NAME@:
CRYPTO_VERSION: @CRYPTO_VERSION@ CRYPTO_VERSION: @CRYPTO_VERSION@
CRYPTO_CFLAGS: @CRYPTO_CFLAGS@ CRYPTO_INCLUDE: @CRYPTO_INCLUDE@
CRYPTO_LIBS: @CRYPTO_LIBS@ CRYPTO_LIBDIR: @CRYPTO_LIBDIR@
Log4cplus: Log4cplus:
LOG4CPLUS_VERSION: @LOG4CPLUS_VERSION@ LOG4CPLUS_VERSION: @LOG4CPLUS_VERSION@
LOG4CPLUS_CFLAGS: @LOG4CPLUS_CFLAGS@ LOG4CPLUS_INCLUDE: @LOG4CPLUS_INCLUDE@
LOG4CPLUS_LIBS: @LOG4CPLUS_LIBS@ LOG4CPLUS_LIBDIR: @LOG4CPLUS_LIBDIR@
Flex/bison: Flex/bison:
FLEX: @FLEX@ FLEX: @FLEX@
BISON: @BISON@ BISON: @BISON@
END END
if test "@HAVE_MYSQL@" != "no" ; then if test "@HAVE_MYSQL@" != "no" ; then
cat >> @TOP_BUILD_DIR@/config.report << END cat >> @TOP_BUILD_DIR@/config.report << END
MySQL: MySQL:
MYSQL_VERSION: @MYSQL_VERSION@ MYSQL_VERSION: @MYSQL_VERSION@
MYSQL_CFLAGS: @MYSQL_CFLAGS@ MYSQL_INCLUDE: @MYSQL_INCLUDE@
MYSQL_LIBS: @MYSQL_LIBS@ MYSQL_LIBDIR: @MYSQL_LIBDIR@
END END
else else
cat >> @TOP_BUILD_DIR@/config.report << END cat >> @TOP_BUILD_DIR@/config.report << END
MySQL: MySQL:
no no
END END
fi fi
if test "@HAVE_PGSQL@" != "no" ; then if test "@HAVE_PGSQL@" != "no" ; then
cat >> @TOP_BUILD_DIR@/config.report << END cat >> @TOP_BUILD_DIR@/config.report << END
PostgreSQL: PostgreSQL:
PGSQL_VERSION: @PGSQL_VERSION@ PGSQL_VERSION: @PGSQL_VERSION@
PGSQL_CFLAGS: @PGSQL_CFLAGS@ PGSQL_INCLUDE: @PGSQL_INCLUDE@
PGSQL_LIBS: @PGSQL_LIBS@ PGSQL_LIBDIR: @PGSQL_LIBDIR@
END END
else else
cat >> @TOP_BUILD_DIR@/config.report << END cat >> @TOP_BUILD_DIR@/config.report << END
PostgreSQL: PostgreSQL:
no no
END END
fi fi
cat >> @TOP_BUILD_DIR@/config.report << END cat >> @TOP_BUILD_DIR@/config.report << END
NETCONF: NETCONF:
@HAVE_NETCONF@ @HAVE_NETCONF@
END END
if test "@HAVE_GTEST@" != "no" ; then if test "@HAVE_GTEST@" != "no" ; then
cat >> @TOP_BUILD_DIR@/config.report << END cat >> @TOP_BUILD_DIR@/config.report << END
Google Test: Google Test:
GTEST_VERSION: @GTEST_VERSION@ GTEST_VERSION: @GTEST_VERSION@
GTEST_CFLAGS: @GTEST_CFLAGS@ GTEST_INCLUDE: @GTEST_INCLUDE@
GTEST_LIBS: @GTEST_LIBS@ GTEST_LIBDIR: @GTEST_LIBDIR@
END END
else else
cat >> @TOP_BUILD_DIR@/config.report << END cat >> @TOP_BUILD_DIR@/config.report << END
Google Test: Google Test:
no no
END END
fi fi
cat >> @TOP_BUILD_DIR@/config.report << END
END
# cat @TOP_BUILD_DIR@/config.report

156
meson.build
View File

@@ -1,7 +1,9 @@
# Ask mesion >= 1.1.0 for build options.
project( project(
'kea', 'kea',
'cpp', 'cpp',
version: '2.7.7-git', version: '2.7.7-git',
meson_version: '>=1.1.0',
default_options: ['default_library=shared'], default_options: ['default_library=shared'],
) )
@@ -157,9 +159,12 @@ if not crypto.found()
endif endif
# Kerberos # Kerberos
krb5_config = disabler()
krb5 = dependency('krb5', required: false) krb5 = dependency('krb5', required: false)
if not krb5.found() if not krb5.found()
krb5_config = find_program('krb5-config', required: false) krb5_config = find_program('krb5-config', required: false)
endif
if krb5_config.found()
cflags = run_command([krb5_config, '--cflags'], check: false) cflags = run_command([krb5_config, '--cflags'], check: false)
libs = run_command([krb5_config, '--libs'], check: false) libs = run_command([krb5_config, '--libs'], check: false)
if cflags.returncode() == 0 and libs.returncode() == 0 if cflags.returncode() == 0 and libs.returncode() == 0
@@ -175,20 +180,27 @@ mysql = dependency('mariadb', required: false)
if not mysql.found() if not mysql.found()
mysql = dependency('mysql', required: false) mysql = dependency('mysql', required: false)
endif endif
foreach mysql_config : ['mariadb_config', 'mysql_config'] mysql_config = disabler()
foreach mysql_config_file : ['mariadb_config', 'mysql_config']
if mysql.found() if mysql.found()
continue continue
endif endif
mysql_config = find_program(mysql_config, required: false) mysql_config = find_program(mysql_config_file, required: false)
if not mysql_config.found() if not mysql_config.found()
continue continue
endif endif
cflags = run_command([mysql_config, '--cflags'], 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)
if cflags.returncode() == 0 and libs.returncode() == 0 version = run_command([mysql_config, '--version'], check: false)
if cflags.returncode() == 0 and libs.returncode() == 0 and version.returncode() == 0
mysql_compile_args = cflags.stdout().split()
mysql_link_args = libs.stdout().split()
mysql_version = version.stdout().strip()
mysql = declare_dependency( mysql = declare_dependency(
compile_args: cflags.stdout().split(), compile_args: mysql_compile_args,
link_args: libs.stdout().split(), link_args: mysql_link_args,
version: mysql_version,
) )
break break
endif endif
@@ -199,14 +211,22 @@ endif
# PostgreSQL # PostgreSQL
postgresql = dependency('libpq', required: false) postgresql = dependency('libpq', required: false)
pg_config = disabler()
if not postgresql.found() if not postgresql.found()
pg_config = find_program('pg_config', required: false) pg_config = find_program('pg_config', required: false)
endif
if pg_config.found()
cflags = run_command([pg_config, '--cflags'], check: false) cflags = run_command([pg_config, '--cflags'], check: false)
libs = run_command([pg_config, '--libs'], check: false) libs = run_command([pg_config, '--libs'], check: false)
if cflags.returncode() == 0 and libs.returncode() == 0 version = run_command([pg_config, '--version'], check: false)
if cflags.returncode() == 0 and libs.returncode() == 0 and version.returncode() == 0
pgsql_compile_args = cflags.stdout().split()
pgsql_link_args = libs.stdout().split()
pgsql_version = version.stdout().strip()
postgresql = declare_dependency( postgresql = declare_dependency(
compile_args: cflags.stdout().split(), compile_args: pgsql_compile_args,
link_args: libs.stdout().split(), link_args: pgsql_link_args,
version: pgsql_version,
) )
endif endif
endif endif
@@ -319,11 +339,18 @@ message(f'Detected system "@SYSTEM@".')
#### System-specific Compiler Flags #### System-specific Compiler Flags
compile_args = []
link_args = []
if SYSTEM == 'darwin' if SYSTEM == 'darwin'
compile_args += ['-D__APPLE_USE_RFC_3542']
add_project_arguments('-D__APPLE_USE_RFC_3542', language: 'cpp') add_project_arguments('-D__APPLE_USE_RFC_3542', language: 'cpp')
add_project_link_arguments(f'-Wl,-rpath,@PREFIX@/lib', language: 'cpp') link_arg = f'-Wl,-rpath,@PREFIX@/lib'
link_args += [link_arg]
add_project_link_arguments(link_arg, language: 'cpp')
else else
add_project_link_arguments(f'-Wl,-rpath=@PREFIX@/lib', language: 'cpp') link_arg = f'-Wl,-rpath=@PREFIX@/lib'
link_args += [link_arg]
add_project_link_arguments(link_arg, language: 'cpp')
endif endif
have_premium = fs.is_dir('premium') have_premium = fs.is_dir('premium')
@@ -380,6 +407,8 @@ if have_premium
else else
report_conf_data.set('PREMIUM', 'no') report_conf_data.set('PREMIUM', 'no')
endif endif
report_conf_data.set('BUILD_OPTIONS', meson.build_options())
report_conf_data.set('MESON_VERSION', meson.version())
report_conf_data.set('CXX', ' '.join(cpp.cmd_array())) report_conf_data.set('CXX', ' '.join(cpp.cmd_array()))
report_conf_data.set('CXX_ID', cpp.get_id()) report_conf_data.set('CXX_ID', cpp.get_id())
result = run_command(cpp, '--version', check: false) result = run_command(cpp, '--version', check: false)
@@ -398,6 +427,9 @@ if result.returncode() == 0
else else
report_conf_data.set('CXX_STANDARD', 'unknown') report_conf_data.set('CXX_STANDARD', 'unknown')
endif endif
report_conf_data.set('CXX_ARGS', ' '.join(compile_args))
report_conf_data.set('LD_ID', cpp.get_linker_id())
report_conf_data.set('LD_ARGS', ' '.join(link_args))
if python_exe.found() if python_exe.found()
report_conf_data.set('HAVE_PYTHON', 'yes') report_conf_data.set('HAVE_PYTHON', 'yes')
report_conf_data.set('PYTHON_PATH', python_exe.full_path()) report_conf_data.set('PYTHON_PATH', python_exe.full_path())
@@ -426,23 +458,23 @@ else
report_conf_data.set('BOOST_VERSION', 'unknown') report_conf_data.set('BOOST_VERSION', 'unknown')
endif endif
report_conf_data.set( report_conf_data.set(
'BOOST_CFLAGS', 'BOOST_INCLUDE',
boost.get_variable('cflags', default_value: 'unknown'), boost.get_variable('includedir', default_value: 'unknown'),
) )
report_conf_data.set( report_conf_data.set(
'BOOST_LIBS', 'BOOST_LIBDIR',
boost.get_variable('libs', default_value: 'unknown'), boost.get_variable('libdir', default_value: 'unknown'),
)
report_conf_data.set('CRYPTO_NAME', crypto.name())
report_conf_data.set(
'CRYPTO_CFLAGS',
crypto.get_variable('cflags', default_value: 'unknown'),
) )
report_conf_data.set( report_conf_data.set(
'CRYPTO_LIBS', 'CRYPTO_INCLUDE',
crypto.get_variable('libs', default_value: 'unknown'), crypto.get_variable('includedir', default_value: 'unknown'),
)
report_conf_data.set(
'CRYPTO_LIBDIR',
crypto.get_variable('libdir', default_value: 'unknown'),
) )
if crypto.name() == botan.name() if crypto.name() == botan.name()
report_conf_data.set('CRYPTO_NAME', 'Botan')
result = cpp.run( result = cpp.run(
fs.read('compiler-checks/get-botan-version.cc'), fs.read('compiler-checks/get-botan-version.cc'),
name: 'Get Botan version', name: 'Get Botan version',
@@ -451,9 +483,10 @@ if crypto.name() == botan.name()
if result.returncode() == 0 if result.returncode() == 0
report_conf_data.set('CRYPTO_VERSION', result.stdout().strip()) report_conf_data.set('CRYPTO_VERSION', result.stdout().strip())
else else
report_conf_data.set('CRYPTO_VERSION', botan.name()) report_conf_data.set('CRYPTO_VERSION', botan.version())
endif endif
elif crypto.name() == openssl.name() elif crypto.name() == openssl.name()
report_conf_data.set('CRYPTO_NAME', 'OpenSSL')
result = cpp.run( result = cpp.run(
fs.read('compiler-checks/get-openssl-version.cc'), fs.read('compiler-checks/get-openssl-version.cc'),
name: 'Get OpenSSL version', name: 'Get OpenSSL version',
@@ -462,16 +495,16 @@ elif crypto.name() == openssl.name()
if result.returncode() == 0 if result.returncode() == 0
report_conf_data.set('CRYPTO_VERSION', result.stdout().strip()) report_conf_data.set('CRYPTO_VERSION', result.stdout().strip())
else else
report_conf_data.set('CRYPTO_VERSION', botan.name()) report_conf_data.set('CRYPTO_VERSION', openssl.version())
endif endif
endif endif
report_conf_data.set( report_conf_data.set(
'LOG4CPLUS_CFLAGS', 'LOG4CPLUS_INCLUDE',
log4cplus.get_variable('cflags', default_value: 'unknown'), log4cplus.get_variable('includedir', default_value: 'unknown'),
) )
report_conf_data.set( report_conf_data.set(
'LOG4CPLUS_LIBS', 'LOG4CPLUS_LIBDIR',
log4cplus.get_variable('libs', default_value: 'unknown'), log4cplus.get_variable('libdir', default_value: 'unknown'),
) )
result = cpp.run( result = cpp.run(
fs.read('compiler-checks/get-log4cplus-version.cc'), fs.read('compiler-checks/get-log4cplus-version.cc'),
@@ -481,7 +514,7 @@ result = cpp.run(
if result.returncode() == 0 if result.returncode() == 0
report_conf_data.set('LOG4CPLUS_VERSION', result.stdout().strip()) report_conf_data.set('LOG4CPLUS_VERSION', result.stdout().strip())
else else
report_conf_data.set('LOG4CPLUS_VERSION', 'unknown') report_conf_data.set('LOG4CPLUS_VERSION', log4cplus.version())
endif endif
if flex_exe.found() if flex_exe.found()
report_conf_data.set('FLEX', flex_exe.full_path()) report_conf_data.set('FLEX', flex_exe.full_path())
@@ -493,32 +526,69 @@ if bison_exe.found()
else else
report_conf_data.set('BISON', 'unknown') report_conf_data.set('BISON', 'unknown')
endif endif
#todo if mysql.found()
report_conf_data.set('HAVE_MYSQL', 'no') report_conf_data.set('HAVE_MYSQL', 'yes')
report_conf_data.set('MYSQL_VERSION', 'unknown') if not mysql_config.found()
report_conf_data.set('MYSQL_CFLAGS', 'unknown') report_conf_data.set('MYSQL_VERSION', mysql.version())
report_conf_data.set('MYSQL_LIBS', 'unknown') report_conf_data.set(
report_conf_data.set('HAVE_PGSQL', 'no') 'MYSQL_INCLUDE',
report_conf_data.set('PGSQL_VERSION', 'unknown') mysql.get_variable('includedir', default_value: 'unknown'),
report_conf_data.set('PGSQL_CFLAGS', 'unknown') )
report_conf_data.set('PGSQL_LIBS', 'unknown') report_conf_data.set(
'MYSQL_LIBDIR',
mysql.get_variable('libdir', default_value: 'unknown'),
)
else
report_conf_data.set('MYSQL_VERSION', mysql_version)
report_conf_data.set('MYSQL_INCLUDE', ' '.join(mysql_compile_args))
report_conf_data.set('MYSQL_LIBDIR', ' '.join(mysql_link_args))
endif
else
report_conf_data.set('HAVE_MYSQL', 'no')
report_conf_data.set('MYSQL_VERSION', 'unknown')
report_conf_data.set('MYSQL_INCLUDE', 'unknown')
report_conf_data.set('MYSQL_LIBDIR', 'unknown')
endif
if postgresql.found()
report_conf_data.set('HAVE_PGSQL', 'yes')
if not pg_config.found()
report_conf_data.set('PGSQL_VERSION', postgresql.version())
report_conf_data.set(
'PGSQL_INCLUDE',
postgresql.get_variable('includedir', default_value: 'unknown'),
)
report_conf_data.set(
'PGSQL_LIBDIR',
postgresql.get_variable('libdir', default_value: 'unknown'),
)
else
report_conf_data.set('PGSQL_VERSION', pgsql_version)
report_conf_data.set('PGSQL_INCLUDE', ' '.join(pgsql_compile_args))
report_conf_data.set('PGSQL_LIBDIR', ' '.join(pgsql_link_args))
endif
else
report_conf_data.set('HAVE_PGSQL', 'no')
report_conf_data.set('PGSQL_VERSION', 'unknown')
report_conf_data.set('PGSQL_INCLUDE', 'unknown')
report_conf_data.set('PGSQL_LIBDIR', 'unknown')
endif
report_conf_data.set('HAVE_NETCONF', 'no') report_conf_data.set('HAVE_NETCONF', 'no')
if gtest.found() if gtest.found()
report_conf_data.set('HAVE_GTEST', 'yes') report_conf_data.set('HAVE_GTEST', 'yes')
report_conf_data.set( report_conf_data.set(
'GTEST_CFLAGS', 'GTEST_INCLUDE',
gtest.get_variable('cflags', default_value: 'unknown'), gtest.get_variable('includedir', default_value: 'unknown'),
) )
report_conf_data.set( report_conf_data.set(
'GTEST_LIBS', 'GTEST_LIBDIR',
gtest.get_variable('libs', default_value: 'unknown'), gtest.get_variable('libdir', default_value: 'unknown'),
) )
report_conf_data.set('GTEST_VERSION', gtest.version()) report_conf_data.set('GTEST_VERSION', gtest.version())
else else
report_conf_data.set('HAVE_GTEST', 'no') report_conf_data.set('HAVE_GTEST', 'no')
report_conf_data.set('GTEST_VERSION', 'unknown') report_conf_data.set('GTEST_VERSION', 'unknown')
report_conf_data.set('GTEST_CFLAGS', 'unknown') report_conf_data.set('GTEST_INCLUDE', 'unknown')
report_conf_data.set('GTEST_LIBS', 'unknown') report_conf_data.set('GTEST_LIBDIR', 'unknown')
endif endif
config_report_sh = configure_file( config_report_sh = configure_file(