[v1] build: Remake config-host.mak when VERSION changes

[Qemu-devel] [PATCH] build: Remake config-host.mak when VERSION changes

Markus Armbruster posted 1 patch 6 years, 10 months ago

Diff against v1
Download mbox

Test asan passed

Test checkpatch passed

Test docker-mingw@fedora passed

Test docker-quick@centos7 passed

Test docker-clang@ubuntu passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20181214084754.23854-1-armbru@redhat.com

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

Expand all Fold all

[Qemu-devel] [PATCH] build: Remake config-host.mak when VERSION changes

Posted by Markus Armbruster 6 years, 10 months ago

configure gets the version number from VERSION, and writes it to
config-host.mak.  The make dependency for that is missing.  Because of
that, a rebuild after a VERSION change may not pick up the change.
Fix that.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c8b9efdad4..038780c6d0 100644
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,7 @@ CONFIG_ALL=y
 -include config-all-devices.mak
 -include config-all-disas.mak
 
-config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios
+config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios $(SRC_PATH)/VERSION
 	@echo $@ is out-of-date, running configure
 	@# TODO: The next lines include code which supports a smooth
 	@# transition from old configurations without config.status.
-- 
2.17.2

Re: [Qemu-devel] [PATCH] build: Remake config-host.mak when VERSION changes

Posted by Eric Blake 6 years, 10 months ago

On 12/14/18 2:47 AM, Markus Armbruster wrote:
> configure gets the version number from VERSION, and writes it to
> config-host.mak.  The make dependency for that is missing.  Because of
> that, a rebuild after a VERSION change may not pick up the change.
> Fix that.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>   Makefile | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> diff --git a/Makefile b/Makefile
> index c8b9efdad4..038780c6d0 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -67,7 +67,7 @@ CONFIG_ALL=y
>   -include config-all-devices.mak
>   -include config-all-disas.mak
>   
> -config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios
> +config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios $(SRC_PATH)/VERSION
>   	@echo $@ is out-of-date, running configure
>   	@# TODO: The next lines include code which supports a smooth
>   	@# transition from old configurations without config.status.
> 

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org