mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-22 01:59:26 +00:00
Code Issues Releases Wiki Activity

Fix cross builds

Browse Source 
Commit 5c9b4f3163e05f64b97d04cba2c17ef59d682830 inadvertently broke
cross builds by making Meson process the doc/misc/meson.build file even
when sphinx-build is not found in PATH.  The doc/misc/meson.build file
defines targets that require a non-native executable, cfg_test, in order
to be built.

Fix by reverting to only processing the doc/misc/ subdirectory when
sphinx-build is found in PATH and moving the relevant alias_target()
method call so that the build targets depending on a non-native
executable are only defined if sphinx-build is found in PATH.
This commit is contained in:
Michał Kępień 2025-07-10 16:56:15 +02:00
parent 59875ecbf1
commit ee5897743d
No known key found for this signature in database
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/meson.build
View File

@ -11,7 +11,6 @@
# Manpages can be build without sphinx # Manpages can be build without sphinx
subdir('man') subdir('man')
subdir('misc')
if not sphinx_build.found() if not sphinx_build.found()
subdir_done() subdir_done()
@ -19,3 +18,4 @@ endif
subdir('arm') subdir('arm')
subdir('dnssec-guide') subdir('dnssec-guide')
subdir('misc')

4
meson.build
View File

@ -1630,8 +1630,6 @@ alias_target('system-test-dependencies', system_test_targets)
### Documentation ### Documentation
alias_target('doc-misc', doc_misc_targets)
get_release_date = ''' get_release_date = '''
import os import os
import datetime import datetime
@ -1663,6 +1661,8 @@ if doc_opt.allowed()
install_man(man_pages) install_man(man_pages)
if sphinx_build.found() if sphinx_build.found()
alias_target('doc-misc', doc_misc_targets)
meson.add_dist_script( meson.add_dist_script(
'util' / 'meson-dist-package.sh', 'util' / 'meson-dist-package.sh',
'manual', 'manual',