configure: record sphinx output

[PATCH v1] configure: record sphinx output

Olaf Hering posted 1 patch 4 years, 1 month ago

Download mbox

Test docker-mingw@fedora passed

Test docker-quick@centos7 passed

Test checkpatch passed

Test FreeBSD passed

Test asan passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200319143954.25694-1-olaf@aepfle.de

configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[PATCH v1] configure: record sphinx output

Posted by Olaf Hering 4 years, 1 month ago

If configure fails to run due to errors in the expected sphinx
environment no helpful message is recorded. Write all of the output to
config.log to assist with debugging.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 12dbb0c76b..55086b0280 100755
--- a/configure
+++ b/configure
@@ -4908,7 +4908,7 @@ has_sphinx_build() {
     # sphinx-build doesn't exist at all or if it is too old.
     mkdir -p "$TMPDIR1/sphinx"
     touch "$TMPDIR1/sphinx/index.rst"
-    "$sphinx_build" -c "$source_path/docs" -b html "$TMPDIR1/sphinx" "$TMPDIR1/sphinx/out" >/dev/null 2>&1
+    "$sphinx_build" -c "$source_path/docs" -b html "$TMPDIR1/sphinx" "$TMPDIR1/sphinx/out" >> config.log 2>&1
 }
 
 # Check if tools are available to build documentation.

Re: [PATCH v1] configure: record sphinx output

Posted by Philippe Mathieu-Daudé 4 years, 1 month ago

On 3/19/20 3:39 PM, Olaf Hering wrote:
> If configure fails to run due to errors in the expected sphinx
> environment no helpful message is recorded. Write all of the output to
> config.log to assist with debugging.
> 
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> ---
>   configure | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index 12dbb0c76b..55086b0280 100755
> --- a/configure
> +++ b/configure
> @@ -4908,7 +4908,7 @@ has_sphinx_build() {
>       # sphinx-build doesn't exist at all or if it is too old.
>       mkdir -p "$TMPDIR1/sphinx"
>       touch "$TMPDIR1/sphinx/index.rst"
> -    "$sphinx_build" -c "$source_path/docs" -b html "$TMPDIR1/sphinx" "$TMPDIR1/sphinx/out" >/dev/null 2>&1
> +    "$sphinx_build" -c "$source_path/docs" -b html "$TMPDIR1/sphinx" "$TMPDIR1/sphinx/out" >> config.log 2>&1
>   }
>   
>   # Check if tools are available to build documentation.
> 
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>