Fix cross builds

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.

diff --git a/doc/meson.build b/doc/meson.build
index 2faef3bf032492e858ca8bf37c17902069d25be0..3c30d254a1c53dc6e1eb2b8d1937d02fee8a79cb 100644 (file)
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -11,7 +11,6 @@
 
 # Manpages can be build without sphinx
 subdir('man')
-subdir('misc')
 
 if not sphinx_build.found()
     subdir_done()
@@ -19,3 +18,4 @@ endif
 
 subdir('arm')
 subdir('dnssec-guide')
+subdir('misc')

diff --git a/meson.build b/meson.build
index 3b854fb5f937ade88244fdfae202c165d19973d1..d4a675b39abe3253243017eaf7bff79e0ba7c81d 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1630,8 +1630,6 @@ alias_target('system-test-dependencies', system_test_targets)
 
 ### Documentation
 
-alias_target('doc-misc', doc_misc_targets)
-
 get_release_date = '''
 import os
 import datetime
@@ -1663,6 +1661,8 @@ if doc_opt.allowed()
     install_man(man_pages)
 
     if sphinx_build.found()
+        alias_target('doc-misc', doc_misc_targets)
+
         meson.add_dist_script(
             'util' / 'meson-dist-package.sh',
             'manual',