* [Qemu-devel] [PATCH] configure: Add config.status to recreate the current configuration
@ 2013-10-20 16:39 Stefan Weil
2013-10-28 18:41 ` Stefan Weil
2013-10-29 1:29 ` Fam Zheng
0 siblings, 2 replies; 3+ messages in thread
From: Stefan Weil @ 2013-10-20 16:39 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, gabriel, Stefan Weil
The latest configure invocation was saved in config-host.mak and could
be extracted from that file to recreate the configuration.
Now it is saved in a new file config.status which can be directly executed
to recreate the configuration. The file name and the comments were copied
from GNU autoconf.
Makefile now uses config.status, but also includes transitional code
for the old mechanism.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
This patch still does not escape special characters in the command line.
I expect that most users don't use such characters, so they have no problem.
It's easy to fix that for hosts with bash: simply replace %s by %q.
If required, this can be done in a later patch.
Regards,
Stefan Weil
Makefile | 9 ++++++++-
configure | 15 +++++++++++++--
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index b15003f..073f18b 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,14 @@ CONFIG_ALL=y
include $(SRC_PATH)/rules.mak
config-host.mak: $(SRC_PATH)/configure
@echo $@ is out-of-date, running configure
- @sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh
+ @# TODO: The next lines include code which supports a smooth
+ @# transition from old configurations without config.status.
+ @# This code can be removed after QEMU 1.7.
+ @if test -x config.status; then \
+ ./config.status; \
+ else \
+ sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh; \
+ fi
else
config-host.mak:
ifneq ($(filter-out %clean,$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail))
diff --git a/configure b/configure
index 57ee62a..125d0c5 100755
--- a/configure
+++ b/configure
@@ -27,6 +27,19 @@ printf " '%s'" "$0" "$@" >> config.log
echo >> config.log
echo "#" >> config.log
+# Save the configure command line for later reuse.
+cat <<EOD >config.status
+#!/bin/sh
+# Generated by configure.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+EOD
+printf "exec" >>config.status
+printf " '%s'" "$0" "$@" >>config.status
+echo >>config.status
+chmod +x config.status
+
error_exit() {
echo
echo "ERROR: $1"
@@ -3765,8 +3778,6 @@ config_host_mak="config-host.mak"
echo "# Automatically generated by configure - do not modify" >config-all-disas.mak
echo "# Automatically generated by configure - do not modify" > $config_host_mak
-printf "# Configured with:" >> $config_host_mak
-printf " '%s'" "$0" "$@" >> $config_host_mak
echo >> $config_host_mak
echo all: >> $config_host_mak
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] configure: Add config.status to recreate the current configuration
2013-10-20 16:39 [Qemu-devel] [PATCH] configure: Add config.status to recreate the current configuration Stefan Weil
@ 2013-10-28 18:41 ` Stefan Weil
2013-10-29 1:29 ` Fam Zheng
1 sibling, 0 replies; 3+ messages in thread
From: Stefan Weil @ 2013-10-28 18:41 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, gabriel
Am 20.10.2013 18:39, schrieb Stefan Weil:
> The latest configure invocation was saved in config-host.mak and could
> be extracted from that file to recreate the configuration.
>
> Now it is saved in a new file config.status which can be directly executed
> to recreate the configuration. The file name and the comments were copied
> from GNU autoconf.
>
> Makefile now uses config.status, but also includes transitional code
> for the old mechanism.
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>
> This patch still does not escape special characters in the command line.
> I expect that most users don't use such characters, so they have no problem.
>
> It's easy to fix that for hosts with bash: simply replace %s by %q.
> If required, this can be done in a later patch.
>
> Regards,
> Stefan Weil
>
> Makefile | 9 ++++++++-
> configure | 15 +++++++++++++--
> 2 files changed, 21 insertions(+), 3 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index b15003f..073f18b 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -28,7 +28,14 @@ CONFIG_ALL=y
> include $(SRC_PATH)/rules.mak
> config-host.mak: $(SRC_PATH)/configure
> @echo $@ is out-of-date, running configure
> - @sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh
> + @# TODO: The next lines include code which supports a smooth
> + @# transition from old configurations without config.status.
> + @# This code can be removed after QEMU 1.7.
> + @if test -x config.status; then \
> + ./config.status; \
> + else \
> + sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh; \
> + fi
> else
> config-host.mak:
> ifneq ($(filter-out %clean,$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail))
> diff --git a/configure b/configure
> index 57ee62a..125d0c5 100755
> --- a/configure
> +++ b/configure
> @@ -27,6 +27,19 @@ printf " '%s'" "$0" "$@" >> config.log
> echo >> config.log
> echo "#" >> config.log
>
> +# Save the configure command line for later reuse.
> +cat <<EOD >config.status
> +#!/bin/sh
> +# Generated by configure.
> +# Run this file to recreate the current configuration.
> +# Compiler output produced by configure, useful for debugging
> +# configure, is in config.log if it exists.
> +EOD
> +printf "exec" >>config.status
> +printf " '%s'" "$0" "$@" >>config.status
> +echo >>config.status
> +chmod +x config.status
> +
> error_exit() {
> echo
> echo "ERROR: $1"
> @@ -3765,8 +3778,6 @@ config_host_mak="config-host.mak"
> echo "# Automatically generated by configure - do not modify" >config-all-disas.mak
>
> echo "# Automatically generated by configure - do not modify" > $config_host_mak
> -printf "# Configured with:" >> $config_host_mak
> -printf " '%s'" "$0" "$@" >> $config_host_mak
> echo >> $config_host_mak
>
> echo all: >> $config_host_mak
ping?
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] configure: Add config.status to recreate the current configuration
2013-10-20 16:39 [Qemu-devel] [PATCH] configure: Add config.status to recreate the current configuration Stefan Weil
2013-10-28 18:41 ` Stefan Weil
@ 2013-10-29 1:29 ` Fam Zheng
1 sibling, 0 replies; 3+ messages in thread
From: Fam Zheng @ 2013-10-29 1:29 UTC (permalink / raw)
To: Stefan Weil; +Cc: peter.maydell, gabriel, qemu-devel
On Sun, 10/20 18:39, Stefan Weil wrote:
> The latest configure invocation was saved in config-host.mak and could
> be extracted from that file to recreate the configuration.
>
> Now it is saved in a new file config.status which can be directly executed
> to recreate the configuration. The file name and the comments were copied
> from GNU autoconf.
>
> Makefile now uses config.status, but also includes transitional code
> for the old mechanism.
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>
> This patch still does not escape special characters in the command line.
> I expect that most users don't use such characters, so they have no problem.
>
> It's easy to fix that for hosts with bash: simply replace %s by %q.
> If required, this can be done in a later patch.
>
> Regards,
> Stefan Weil
>
> Makefile | 9 ++++++++-
> configure | 15 +++++++++++++--
> 2 files changed, 21 insertions(+), 3 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index b15003f..073f18b 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -28,7 +28,14 @@ CONFIG_ALL=y
> include $(SRC_PATH)/rules.mak
> config-host.mak: $(SRC_PATH)/configure
> @echo $@ is out-of-date, running configure
> - @sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh
> + @# TODO: The next lines include code which supports a smooth
> + @# transition from old configurations without config.status.
> + @# This code can be removed after QEMU 1.7.
> + @if test -x config.status; then \
> + ./config.status; \
> + else \
> + sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh; \
> + fi
> else
> config-host.mak:
> ifneq ($(filter-out %clean,$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail))
> diff --git a/configure b/configure
> index 57ee62a..125d0c5 100755
> --- a/configure
> +++ b/configure
> @@ -27,6 +27,19 @@ printf " '%s'" "$0" "$@" >> config.log
> echo >> config.log
> echo "#" >> config.log
>
> +# Save the configure command line for later reuse.
> +cat <<EOD >config.status
> +#!/bin/sh
> +# Generated by configure.
> +# Run this file to recreate the current configuration.
> +# Compiler output produced by configure, useful for debugging
> +# configure, is in config.log if it exists.
> +EOD
> +printf "exec" >>config.status
> +printf " '%s'" "$0" "$@" >>config.status
> +echo >>config.status
> +chmod +x config.status
> +
> error_exit() {
> echo
> echo "ERROR: $1"
> @@ -3765,8 +3778,6 @@ config_host_mak="config-host.mak"
> echo "# Automatically generated by configure - do not modify" >config-all-disas.mak
>
> echo "# Automatically generated by configure - do not modify" > $config_host_mak
> -printf "# Configured with:" >> $config_host_mak
> -printf " '%s'" "$0" "$@" >> $config_host_mak
> echo >> $config_host_mak
>
> echo all: >> $config_host_mak
Reviewed-by: Fam Zheng <famz@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-10-29 1:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-20 16:39 [Qemu-devel] [PATCH] configure: Add config.status to recreate the current configuration Stefan Weil
2013-10-28 18:41 ` Stefan Weil
2013-10-29 1:29 ` Fam Zheng
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).