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

[#3866] Meson: Fix SOURCE_OF_INSTALLATION when git is not installed

Browse Source
This commit is contained in:
Andrei Pavel 2025-05-06 11:50:33 +03:00
parent 0ffbaa27a9
commit 980ff2dfd2
No known key found for this signature in database
GPG Key ID: D4E804481939CB21
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meson.build
View File

@ -530,8 +530,9 @@ kea_pkg_version_in_configure = run_command(
).stdout().strip() ).stdout().strip()
if kea_pkg_type_in_configure != '' and kea_pkg_version_in_configure != '' if kea_pkg_type_in_configure != '' and kea_pkg_version_in_configure != ''
SOURCE_OF_INSTALLATION = f'@kea_pkg_version_in_configure@ @kea_pkg_type_in_configure@' SOURCE_OF_INSTALLATION = f'@kea_pkg_version_in_configure@ @kea_pkg_type_in_configure@'
else elif fs.is_dir('.git')
if fs.is_dir('.git') and git.found() SOURCE_OF_INSTALLATION = 'git'
if git.found()
result = run_command( result = run_command(
CD_AND_RUN, CD_AND_RUN,
TOP_SOURCE_DIR, TOP_SOURCE_DIR,
@ -541,11 +542,11 @@ else
check: false, check: false,
) )
if result.returncode() == 0 if result.returncode() == 0
SOURCE_OF_INSTALLATION = 'git ' + result.stdout().strip() SOURCE_OF_INSTALLATION += ' ' + result.stdout().strip()
endif endif
else
SOURCE_OF_INSTALLATION = 'tarball'
endif endif
else
SOURCE_OF_INSTALLATION = 'tarball'
endif endif
conf_data.set( conf_data.set(
'EXTENDED_VERSION', 'EXTENDED_VERSION',