* [PATCH] configure: Avoid error messages about missing *-config-*.h files
@ 2021-05-19 10:57 Thomas Huth
2021-05-19 11:08 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Huth @ 2021-05-19 10:57 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Paolo Bonzini, Philippe Mathieu-Daudé
When compiling with --disable-system there is a harmless yet still
annoying error message at the end of the "configure" step:
sed: can't read *-config-devices.h: No such file or directory
When only building the tools or docs, without any emulator at all,
there is even an additional message about missing *-config-target.h
files.
Fix it by checking whether any of these files are available before
using them.
Fixes: e0447a834d ("configure: Poison all current target-specific #defines")
Reported-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
configure | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index 963e35b9a7..a8a9e78c61 100755
--- a/configure
+++ b/configure
@@ -6458,10 +6458,14 @@ fi
# Create list of config switches that should be poisoned in common code...
# but filter out CONFIG_TCG and CONFIG_USER_ONLY which are special.
-sed -n -e '/CONFIG_TCG/d' -e '/CONFIG_USER_ONLY/d' \
- -e '/^#define / { s///; s/ .*//; s/^/#pragma GCC poison /p; }' \
- *-config-devices.h *-config-target.h | \
- sort -u > config-poison.h
+target_configs_h=$(ls *-config-devices.h *-config-target.h 2>/dev/null)
+if test -n "$target_configs_h" ; then
+ sed -n -e '/CONFIG_TCG/d' -e '/CONFIG_USER_ONLY/d' \
+ -e '/^#define / { s///; s/ .*//; s/^/#pragma GCC poison /p; }' \
+ $target_configs_h | sort -u > config-poison.h
+else
+ touch config-poison.h
+fi
# Save the configure command line for later reuse.
cat <<EOD >config.status
--
2.27.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] configure: Avoid error messages about missing *-config-*.h files
2021-05-19 10:57 [PATCH] configure: Avoid error messages about missing *-config-*.h files Thomas Huth
@ 2021-05-19 11:08 ` Philippe Mathieu-Daudé
2021-05-19 11:31 ` Thomas Huth
0 siblings, 1 reply; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-05-19 11:08 UTC (permalink / raw)
To: Thomas Huth, qemu-devel; +Cc: qemu-trivial, Paolo Bonzini
On 5/19/21 12:57 PM, Thomas Huth wrote:
> When compiling with --disable-system there is a harmless yet still
> annoying error message at the end of the "configure" step:
>
> sed: can't read *-config-devices.h: No such file or directory
>
> When only building the tools or docs, without any emulator at all,
> there is even an additional message about missing *-config-target.h
> files.
>
> Fix it by checking whether any of these files are available before
> using them.
>
> Fixes: e0447a834d ("configure: Poison all current target-specific #defines")
> Reported-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> configure | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/configure b/configure
> index 963e35b9a7..a8a9e78c61 100755
> --- a/configure
> +++ b/configure
> @@ -6458,10 +6458,14 @@ fi
>
> # Create list of config switches that should be poisoned in common code...
> # but filter out CONFIG_TCG and CONFIG_USER_ONLY which are special.
> -sed -n -e '/CONFIG_TCG/d' -e '/CONFIG_USER_ONLY/d' \
> - -e '/^#define / { s///; s/ .*//; s/^/#pragma GCC poison /p; }' \
> - *-config-devices.h *-config-target.h | \
> - sort -u > config-poison.h
> +target_configs_h=$(ls *-config-devices.h *-config-target.h 2>/dev/null)
> +if test -n "$target_configs_h" ; then
> + sed -n -e '/CONFIG_TCG/d' -e '/CONFIG_USER_ONLY/d' \
> + -e '/^#define / { s///; s/ .*//; s/^/#pragma GCC poison /p; }' \
> + $target_configs_h | sort -u > config-poison.h
> +else
> + touch config-poison.h
:> config-poison.h is safer.
> +fi
>
> # Save the configure command line for later reuse.
> cat <<EOD >config.status
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] configure: Avoid error messages about missing *-config-*.h files
2021-05-19 11:08 ` Philippe Mathieu-Daudé
@ 2021-05-19 11:31 ` Thomas Huth
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Huth @ 2021-05-19 11:31 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel; +Cc: qemu-trivial, Paolo Bonzini
On 19/05/2021 13.08, Philippe Mathieu-Daudé wrote:
> On 5/19/21 12:57 PM, Thomas Huth wrote:
>> When compiling with --disable-system there is a harmless yet still
>> annoying error message at the end of the "configure" step:
>>
>> sed: can't read *-config-devices.h: No such file or directory
>>
>> When only building the tools or docs, without any emulator at all,
>> there is even an additional message about missing *-config-target.h
>> files.
>>
>> Fix it by checking whether any of these files are available before
>> using them.
>>
>> Fixes: e0447a834d ("configure: Poison all current target-specific #defines")
>> Reported-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>> configure | 12 ++++++++----
>> 1 file changed, 8 insertions(+), 4 deletions(-)
>>
>> diff --git a/configure b/configure
>> index 963e35b9a7..a8a9e78c61 100755
>> --- a/configure
>> +++ b/configure
>> @@ -6458,10 +6458,14 @@ fi
>>
>> # Create list of config switches that should be poisoned in common code...
>> # but filter out CONFIG_TCG and CONFIG_USER_ONLY which are special.
>> -sed -n -e '/CONFIG_TCG/d' -e '/CONFIG_USER_ONLY/d' \
>> - -e '/^#define / { s///; s/ .*//; s/^/#pragma GCC poison /p; }' \
>> - *-config-devices.h *-config-target.h | \
>> - sort -u > config-poison.h
>> +target_configs_h=$(ls *-config-devices.h *-config-target.h 2>/dev/null)
>> +if test -n "$target_configs_h" ; then
>> + sed -n -e '/CONFIG_TCG/d' -e '/CONFIG_USER_ONLY/d' \
>> + -e '/^#define / { s///; s/ .*//; s/^/#pragma GCC poison /p; }' \
>> + $target_configs_h | sort -u > config-poison.h
>> +else
>> + touch config-poison.h
>
> :> config-poison.h is safer.
True, I'll send a v2.
Thomas
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-19 11:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-19 10:57 [PATCH] configure: Avoid error messages about missing *-config-*.h files Thomas Huth
2021-05-19 11:08 ` Philippe Mathieu-Daudé
2021-05-19 11:31 ` Thomas Huth
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).