* [Qemu-devel] [PATCH v2] Makefile: Do not generate files if "configure" has not been run yet
@ 2017-06-08 7:40 Thomas Huth
2017-06-08 11:16 ` Fam Zheng
2017-06-08 12:21 ` Eric Blake
0 siblings, 2 replies; 4+ messages in thread
From: Thomas Huth @ 2017-06-08 7:40 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Paolo Bonzini, qemu-trivial, Peter Maydell, Eric Blake
When doing a "make -j10" in the vanilla QEMU source tree (without
running "configure first), the Makefile currently generates two
files already, qemu-version.h and qemu-options.def. This should not
happen, so let's make these targets depend on config-host.mak.
Also the targets that use python can not be executed without the
$(PYTHON) from config-host.mak, so these should depend on the config-
host.mak file, too (these targets generate some ugly error messages
otherwise during "make -j10").
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
v2:
- Add the dependency to the targets that use $(PYTHON) instead of
adding it to $(qapi-py)
Makefile | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index c830d7a..b5e0731 100644
--- a/Makefile
+++ b/Makefile
@@ -286,7 +286,7 @@ endif
all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules
-qemu-version.h: FORCE
+qemu-version.h: config-host.mak FORCE
$(call quiet-command, \
(cd $(SRC_PATH); \
printf '#define QEMU_PKGVERSION '; \
@@ -312,6 +312,7 @@ qemu-version.h: FORCE
config-host.h: config-host.h-timestamp
config-host.h-timestamp: config-host.mak
+qemu-options.def: config-host.mak
qemu-options.def: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool
$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@")
@@ -394,17 +395,17 @@ gen-out-type = $(subst .,-,$(suffix $@))
qapi-py = $(SRC_PATH)/scripts/qapi.py $(SRC_PATH)/scripts/ordereddict.py
qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h :\
-$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)
+$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py) config-host.mak
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py \
$(gen-out-type) -o qga/qapi-generated -p "qga-" $<, \
"GEN","$@")
qga/qapi-generated/qga-qapi-visit.c qga/qapi-generated/qga-qapi-visit.h :\
-$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py)
+$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py) config-host.mak
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py \
$(gen-out-type) -o qga/qapi-generated -p "qga-" $<, \
"GEN","$@")
qga/qapi-generated/qga-qmp-commands.h qga/qapi-generated/qga-qmp-marshal.c :\
-$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)
+$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) config-host.mak
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \
$(gen-out-type) -o qga/qapi-generated -p "qga-" $<, \
"GEN","$@")
@@ -416,27 +417,27 @@ qapi-modules = $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi/common.json \
$(SRC_PATH)/qapi/trace.json
qapi-types.c qapi-types.h :\
-$(qapi-modules) $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)
+$(qapi-modules) $(SRC_PATH)/scripts/qapi-types.py $(qapi-py) config-host.mak
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py \
$(gen-out-type) -o "." -b $<, \
"GEN","$@")
qapi-visit.c qapi-visit.h :\
-$(qapi-modules) $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py)
+$(qapi-modules) $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py) config-host.mak
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py \
$(gen-out-type) -o "." -b $<, \
"GEN","$@")
qapi-event.c qapi-event.h :\
-$(qapi-modules) $(SRC_PATH)/scripts/qapi-event.py $(qapi-py)
+$(qapi-modules) $(SRC_PATH)/scripts/qapi-event.py $(qapi-py) config-host.mak
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-event.py \
$(gen-out-type) -o "." $<, \
"GEN","$@")
qmp-commands.h qmp-marshal.c :\
-$(qapi-modules) $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)
+$(qapi-modules) $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) config-host.mak
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \
$(gen-out-type) -o "." $<, \
"GEN","$@")
qmp-introspect.h qmp-introspect.c :\
-$(qapi-modules) $(SRC_PATH)/scripts/qapi-introspect.py $(qapi-py)
+$(qapi-modules) $(SRC_PATH)/scripts/qapi-introspect.py $(qapi-py) config-host.mak
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-introspect.py \
$(gen-out-type) -o "." $<, \
"GEN","$@")
@@ -703,10 +704,10 @@ qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool
docs/qemu-qmp-qapi.texi docs/qemu-ga-qapi.texi: $(SRC_PATH)/scripts/qapi2texi.py $(qapi-py)
-docs/qemu-qmp-qapi.texi: $(qapi-modules)
+docs/qemu-qmp-qapi.texi: $(qapi-modules) config-host.mak
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi2texi.py $< > $@,"GEN","$@")
-docs/qemu-ga-qapi.texi: $(SRC_PATH)/qga/qapi-schema.json
+docs/qemu-ga-qapi.texi: $(SRC_PATH)/qga/qapi-schema.json config-host.mak
$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi2texi.py $< > $@,"GEN","$@")
qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi qemu-monitor-info.texi
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v2] Makefile: Do not generate files if "configure" has not been run yet
2017-06-08 7:40 [Qemu-devel] [PATCH v2] Makefile: Do not generate files if "configure" has not been run yet Thomas Huth
@ 2017-06-08 11:16 ` Fam Zheng
2017-06-08 12:43 ` Thomas Huth
2017-06-08 12:21 ` Eric Blake
1 sibling, 1 reply; 4+ messages in thread
From: Fam Zheng @ 2017-06-08 11:16 UTC (permalink / raw)
To: Thomas Huth; +Cc: qemu-devel, qemu-trivial, Paolo Bonzini, Peter Maydell
On Thu, 06/08 09:40, Thomas Huth wrote:
> When doing a "make -j10" in the vanilla QEMU source tree (without
> running "configure first), the Makefile currently generates two
> files already, qemu-version.h and qemu-options.def. This should not
> happen, so let's make these targets depend on config-host.mak.
> Also the targets that use python can not be executed without the
> $(PYTHON) from config-host.mak, so these should depend on the config-
> host.mak file, too (these targets generate some ugly error messages
> otherwise during "make -j10").
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> v2:
> - Add the dependency to the targets that use $(PYTHON) instead of
> adding it to $(qapi-py)
>
> Makefile | 23 ++++++++++++-----------
> 1 file changed, 12 insertions(+), 11 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index c830d7a..b5e0731 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -286,7 +286,7 @@ endif
>
> all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules
Is it enough to add a
$(filter-out $(GENERATED_FILES),config-host.mak): config-host.mak
after the variable is fully built? (Seems config-host.mak is not included, but
filtering out is safer.)
Fam
>
> -qemu-version.h: FORCE
> +qemu-version.h: config-host.mak FORCE
> $(call quiet-command, \
> (cd $(SRC_PATH); \
> printf '#define QEMU_PKGVERSION '; \
> @@ -312,6 +312,7 @@ qemu-version.h: FORCE
>
> config-host.h: config-host.h-timestamp
> config-host.h-timestamp: config-host.mak
> +qemu-options.def: config-host.mak
> qemu-options.def: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool
> $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@")
>
> @@ -394,17 +395,17 @@ gen-out-type = $(subst .,-,$(suffix $@))
> qapi-py = $(SRC_PATH)/scripts/qapi.py $(SRC_PATH)/scripts/ordereddict.py
>
> qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h :\
> -$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)
> +$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py) config-host.mak
> $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py \
> $(gen-out-type) -o qga/qapi-generated -p "qga-" $<, \
> "GEN","$@")
> qga/qapi-generated/qga-qapi-visit.c qga/qapi-generated/qga-qapi-visit.h :\
> -$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py)
> +$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py) config-host.mak
> $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py \
> $(gen-out-type) -o qga/qapi-generated -p "qga-" $<, \
> "GEN","$@")
> qga/qapi-generated/qga-qmp-commands.h qga/qapi-generated/qga-qmp-marshal.c :\
> -$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)
> +$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) config-host.mak
> $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \
> $(gen-out-type) -o qga/qapi-generated -p "qga-" $<, \
> "GEN","$@")
> @@ -416,27 +417,27 @@ qapi-modules = $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi/common.json \
> $(SRC_PATH)/qapi/trace.json
>
> qapi-types.c qapi-types.h :\
> -$(qapi-modules) $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)
> +$(qapi-modules) $(SRC_PATH)/scripts/qapi-types.py $(qapi-py) config-host.mak
> $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py \
> $(gen-out-type) -o "." -b $<, \
> "GEN","$@")
> qapi-visit.c qapi-visit.h :\
> -$(qapi-modules) $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py)
> +$(qapi-modules) $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py) config-host.mak
> $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py \
> $(gen-out-type) -o "." -b $<, \
> "GEN","$@")
> qapi-event.c qapi-event.h :\
> -$(qapi-modules) $(SRC_PATH)/scripts/qapi-event.py $(qapi-py)
> +$(qapi-modules) $(SRC_PATH)/scripts/qapi-event.py $(qapi-py) config-host.mak
> $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-event.py \
> $(gen-out-type) -o "." $<, \
> "GEN","$@")
> qmp-commands.h qmp-marshal.c :\
> -$(qapi-modules) $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py)
> +$(qapi-modules) $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) config-host.mak
> $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \
> $(gen-out-type) -o "." $<, \
> "GEN","$@")
> qmp-introspect.h qmp-introspect.c :\
> -$(qapi-modules) $(SRC_PATH)/scripts/qapi-introspect.py $(qapi-py)
> +$(qapi-modules) $(SRC_PATH)/scripts/qapi-introspect.py $(qapi-py) config-host.mak
> $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-introspect.py \
> $(gen-out-type) -o "." $<, \
> "GEN","$@")
> @@ -703,10 +704,10 @@ qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool
>
> docs/qemu-qmp-qapi.texi docs/qemu-ga-qapi.texi: $(SRC_PATH)/scripts/qapi2texi.py $(qapi-py)
>
> -docs/qemu-qmp-qapi.texi: $(qapi-modules)
> +docs/qemu-qmp-qapi.texi: $(qapi-modules) config-host.mak
> $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi2texi.py $< > $@,"GEN","$@")
>
> -docs/qemu-ga-qapi.texi: $(SRC_PATH)/qga/qapi-schema.json
> +docs/qemu-ga-qapi.texi: $(SRC_PATH)/qga/qapi-schema.json config-host.mak
> $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi2texi.py $< > $@,"GEN","$@")
>
> qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi qemu-monitor-info.texi
> --
> 1.8.3.1
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v2] Makefile: Do not generate files if "configure" has not been run yet
2017-06-08 7:40 [Qemu-devel] [PATCH v2] Makefile: Do not generate files if "configure" has not been run yet Thomas Huth
2017-06-08 11:16 ` Fam Zheng
@ 2017-06-08 12:21 ` Eric Blake
1 sibling, 0 replies; 4+ messages in thread
From: Eric Blake @ 2017-06-08 12:21 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: Fam Zheng, Paolo Bonzini, qemu-trivial, Peter Maydell
[-- Attachment #1: Type: text/plain, Size: 2412 bytes --]
On 06/08/2017 02:40 AM, Thomas Huth wrote:
> When doing a "make -j10" in the vanilla QEMU source tree (without
> running "configure first), the Makefile currently generates two
> files already, qemu-version.h and qemu-options.def. This should not
> happen, so let's make these targets depend on config-host.mak.
> Also the targets that use python can not be executed without the
> $(PYTHON) from config-host.mak, so these should depend on the config-
> host.mak file, too (these targets generate some ugly error messages
> otherwise during "make -j10").
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> v2:
> - Add the dependency to the targets that use $(PYTHON) instead of
> adding it to $(qapi-py)
>
> @@ -312,6 +312,7 @@ qemu-version.h: FORCE
>
> config-host.h: config-host.h-timestamp
> config-host.h-timestamp: config-host.mak
> +qemu-options.def: config-host.mak
> qemu-options.def: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool
> $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@")
This works (namely, splitting the dependencies between a no-op rule and
the real rule:
a:b
a:c
recipe
), but looks unusual compared to having a single rule with all the
dependencies:
a: b c
recipe
> @@ -394,17 +395,17 @@ gen-out-type = $(subst .,-,$(suffix $@))
> qapi-py = $(SRC_PATH)/scripts/qapi.py $(SRC_PATH)/scripts/ordereddict.py
>
> qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h :\
> -$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)
> +$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py) config-host.mak
> $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py \
Long line. Let's use \ line-splitting to keep things under 80 columns
(if Fam's suggestion of adding the dependency just once doesn't pan out).
> $(gen-out-type) -o qga/qapi-generated -p "qga-" $<, \
> "GEN","$@")
> qga/qapi-generated/qga-qapi-visit.c qga/qapi-generated/qga-qapi-visit.h :\
> -$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py)
> +$(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py) config-host.mak
More long lines ahead.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v2] Makefile: Do not generate files if "configure" has not been run yet
2017-06-08 11:16 ` Fam Zheng
@ 2017-06-08 12:43 ` Thomas Huth
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Huth @ 2017-06-08 12:43 UTC (permalink / raw)
To: Fam Zheng
Cc: qemu-devel, qemu-trivial, Paolo Bonzini, Peter Maydell, Eric Blake
[-- Attachment #1: Type: text/plain, Size: 1674 bytes --]
On 08.06.2017 13:16, Fam Zheng wrote:
> On Thu, 06/08 09:40, Thomas Huth wrote:
>> When doing a "make -j10" in the vanilla QEMU source tree (without
>> running "configure first), the Makefile currently generates two
>> files already, qemu-version.h and qemu-options.def. This should not
>> happen, so let's make these targets depend on config-host.mak.
>> Also the targets that use python can not be executed without the
>> $(PYTHON) from config-host.mak, so these should depend on the config-
>> host.mak file, too (these targets generate some ugly error messages
>> otherwise during "make -j10").
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>> v2:
>> - Add the dependency to the targets that use $(PYTHON) instead of
>> adding it to $(qapi-py)
>>
>> Makefile | 23 ++++++++++++-----------
>> 1 file changed, 12 insertions(+), 11 deletions(-)
>>
>> diff --git a/Makefile b/Makefile
>> index c830d7a..b5e0731 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -286,7 +286,7 @@ endif
>>
>> all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules
>
> Is it enough to add a
>
> $(filter-out $(GENERATED_FILES),config-host.mak): config-host.mak
>
> after the variable is fully built? (Seems config-host.mak is not included, but
> filtering out is safer.)
That works for the files that I've mentioned in the patch description,
but I then suddenly see lots of *.pyc files in scripts/tracetool instead...
Anyway, I think I've now found a way that works even more reliable:
Simply disable the "Makefile: $(GENERATED_FILES)" rule if
config-host.mak is missing. I'll send a v3 patch in a minute...
Thomas
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-06-08 12:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-08 7:40 [Qemu-devel] [PATCH v2] Makefile: Do not generate files if "configure" has not been run yet Thomas Huth
2017-06-08 11:16 ` Fam Zheng
2017-06-08 12:43 ` Thomas Huth
2017-06-08 12:21 ` Eric Blake
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.