* [Qemu-devel] [PATCH] Makefile.target: include top level build dir in vpath
@ 2015-08-09 7:02 Michael Marineau
2015-08-12 13:32 ` Paolo Bonzini
0 siblings, 1 reply; 7+ messages in thread
From: Michael Marineau @ 2015-08-09 7:02 UTC (permalink / raw)
To: qemu-devel; +Cc: Michael Marineau
Using ccache with CCACHE_BASEDIR set to $(SRC_PATH) or a parent will
rewrite all absolute paths to relative paths. This interacts poorly with
QEMU's two-level build directory scheme. For example, lets say
BUILD_DIR=$(SRC_PATH)/build so build/blockdev.d will contain:
blockdev.o: ../blockdev.c ../include/sysemu/block-backend.h \
Now the target build under build/x86_64-softmmu or similar will depend
on ../blockdev.o which in turn will get make to source ../blockdev.d to
check its dependencies. Since make always considers paths relative to
the current working directory rather than the makefile the path appeared
in the relative path to ../blockdev.c is useless.
This change simply adds the top level build directory to vpath so paths
relative to the source directory, top build directory, and target build
directory all work just fine.
---
Makefile.target | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.target b/Makefile.target
index 3e7aafd..dc32294 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -7,7 +7,7 @@ include config-target.mak
include config-devices.mak
include $(SRC_PATH)/rules.mak
-$(call set-vpath, $(SRC_PATH))
+$(call set-vpath, $(SRC_PATH):$(BUILD_DIR))
ifdef CONFIG_LINUX
QEMU_CFLAGS += -I../linux-headers
endif
--
2.4.6
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH] Makefile.target: include top level build dir in vpath
2015-08-09 7:02 [Qemu-devel] [PATCH] Makefile.target: include top level build dir in vpath Michael Marineau
@ 2015-08-12 13:32 ` Paolo Bonzini
2015-08-12 14:28 ` Michael Marineau
2015-08-24 0:57 ` Michael Marineau
0 siblings, 2 replies; 7+ messages in thread
From: Paolo Bonzini @ 2015-08-12 13:32 UTC (permalink / raw)
To: Michael Marineau, qemu-devel
On 09/08/2015 09:02, Michael Marineau wrote:
> Using ccache with CCACHE_BASEDIR set to $(SRC_PATH) or a parent will
> rewrite all absolute paths to relative paths. This interacts poorly with
> QEMU's two-level build directory scheme. For example, lets say
> BUILD_DIR=$(SRC_PATH)/build so build/blockdev.d will contain:
>
> blockdev.o: ../blockdev.c ../include/sysemu/block-backend.h \
>
> Now the target build under build/x86_64-softmmu or similar will depend
> on ../blockdev.o which in turn will get make to source ../blockdev.d to
> check its dependencies. Since make always considers paths relative to
> the current working directory rather than the makefile the path appeared
> in the relative path to ../blockdev.c is useless.
>
> This change simply adds the top level build directory to vpath so paths
> relative to the source directory, top build directory, and target build
> directory all work just fine.
> ---
> Makefile.target | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile.target b/Makefile.target
> index 3e7aafd..dc32294 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -7,7 +7,7 @@ include config-target.mak
> include config-devices.mak
> include $(SRC_PATH)/rules.mak
>
> -$(call set-vpath, $(SRC_PATH))
> +$(call set-vpath, $(SRC_PATH):$(BUILD_DIR))
> ifdef CONFIG_LINUX
> QEMU_CFLAGS += -I../linux-headers
> endif
>
Hi,
can you reply with "Signed-off-by: Michael Marineau
<michael.marineau@coreos.com>", representing that you've read and agreed
to the Developer Certificate of Origin (http://developercertificate.org/)?
This is necessary to include your patch in QEMU.
Paolo
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH] Makefile.target: include top level build dir in vpath
2015-08-12 13:32 ` Paolo Bonzini
@ 2015-08-12 14:28 ` Michael Marineau
2015-08-24 0:57 ` Michael Marineau
1 sibling, 0 replies; 7+ messages in thread
From: Michael Marineau @ 2015-08-12 14:28 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel
[-- Attachment #1: Type: text/plain, Size: 1904 bytes --]
On Aug 12, 2015 6:32 AM, "Paolo Bonzini" <pbonzini@redhat.com> wrote:
>
>
>
> On 09/08/2015 09:02, Michael Marineau wrote:
> > Using ccache with CCACHE_BASEDIR set to $(SRC_PATH) or a parent will
> > rewrite all absolute paths to relative paths. This interacts poorly with
> > QEMU's two-level build directory scheme. For example, lets say
> > BUILD_DIR=$(SRC_PATH)/build so build/blockdev.d will contain:
> >
> > blockdev.o: ../blockdev.c ../include/sysemu/block-backend.h \
> >
> > Now the target build under build/x86_64-softmmu or similar will depend
> > on ../blockdev.o which in turn will get make to source ../blockdev.d to
> > check its dependencies. Since make always considers paths relative to
> > the current working directory rather than the makefile the path appeared
> > in the relative path to ../blockdev.c is useless.
> >
> > This change simply adds the top level build directory to vpath so paths
> > relative to the source directory, top build directory, and target build
> > directory all work just fine.
> > ---
> > Makefile.target | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/Makefile.target b/Makefile.target
> > index 3e7aafd..dc32294 100644
> > --- a/Makefile.target
> > +++ b/Makefile.target
> > @@ -7,7 +7,7 @@ include config-target.mak
> > include config-devices.mak
> > include $(SRC_PATH)/rules.mak
> >
> > -$(call set-vpath, $(SRC_PATH))
> > +$(call set-vpath, $(SRC_PATH):$(BUILD_DIR))
> > ifdef CONFIG_LINUX
> > QEMU_CFLAGS += -I../linux-headers
> > endif
> >
>
> Hi,
>
> can you reply with "Signed-off-by: Michael Marineau
> <michael.marineau@coreos.com>", representing that you've read and agreed
> to the Developer Certificate of Origin (http://developercertificate.org/)?
>
> This is necessary to include your patch in QEMU.
>
> Paolo
Oops, forgot about that.
Signed-off-by: Michael Marineau
<michael.marineau@coreos.com>
[-- Attachment #2: Type: text/html, Size: 2688 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Qemu-devel] [PATCH] Makefile.target: include top level build dir in vpath
2015-08-12 13:32 ` Paolo Bonzini
2015-08-12 14:28 ` Michael Marineau
@ 2015-08-24 0:57 ` Michael Marineau
2015-09-07 21:02 ` Michael Marineau
1 sibling, 1 reply; 7+ messages in thread
From: Michael Marineau @ 2015-08-24 0:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Michael Marineau
Using ccache with CCACHE_BASEDIR set to $(SRC_PATH) or a parent will
rewrite all absolute paths to relative paths. This interacts poorly with
QEMU's two-level build directory scheme. For example, lets say
BUILD_DIR=$(SRC_PATH)/build so build/blockdev.d will contain:
blockdev.o: ../blockdev.c ../include/sysemu/block-backend.h \
Now the target build under build/x86_64-softmmu or similar will depend
on ../blockdev.o which in turn will get make to source ../blockdev.d to
check its dependencies. Since make always considers paths relative to
the current working directory rather than the makefile the path appeared
in the relative path to ../blockdev.c is useless.
This change simply adds the top level build directory to vpath so paths
relative to the source directory, top build directory, and target build
directory all work just fine.
Signed-off-by: Michael Marineau <michael.marineau@coreos.com>
---
This is a re-send with the proper Signed-off-by line.
Makefile.target | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.target b/Makefile.target
index 3e7aafd..dc32294 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -7,7 +7,7 @@ include config-target.mak
include config-devices.mak
include $(SRC_PATH)/rules.mak
-$(call set-vpath, $(SRC_PATH))
+$(call set-vpath, $(SRC_PATH):$(BUILD_DIR))
ifdef CONFIG_LINUX
QEMU_CFLAGS += -I../linux-headers
endif
--
2.4.6
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH] Makefile.target: include top level build dir in vpath
2015-08-24 0:57 ` Michael Marineau
@ 2015-09-07 21:02 ` Michael Marineau
2015-09-07 21:11 ` Paolo Bonzini
0 siblings, 1 reply; 7+ messages in thread
From: Michael Marineau @ 2015-09-07 21:02 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Michael Marineau
On Sun, Aug 23, 2015 at 5:57 PM, Michael Marineau
<michael.marineau@coreos.com> wrote:
> Using ccache with CCACHE_BASEDIR set to $(SRC_PATH) or a parent will
> rewrite all absolute paths to relative paths. This interacts poorly with
> QEMU's two-level build directory scheme. For example, lets say
> BUILD_DIR=$(SRC_PATH)/build so build/blockdev.d will contain:
>
> blockdev.o: ../blockdev.c ../include/sysemu/block-backend.h \
>
> Now the target build under build/x86_64-softmmu or similar will depend
> on ../blockdev.o which in turn will get make to source ../blockdev.d to
> check its dependencies. Since make always considers paths relative to
> the current working directory rather than the makefile the path appeared
> in the relative path to ../blockdev.c is useless.
>
> This change simply adds the top level build directory to vpath so paths
> relative to the source directory, top build directory, and target build
> directory all work just fine.
>
> Signed-off-by: Michael Marineau <michael.marineau@coreos.com>
> ---
>
> This is a re-send with the proper Signed-off-by line.
>
> Makefile.target | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile.target b/Makefile.target
> index 3e7aafd..dc32294 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -7,7 +7,7 @@ include config-target.mak
> include config-devices.mak
> include $(SRC_PATH)/rules.mak
>
> -$(call set-vpath, $(SRC_PATH))
> +$(call set-vpath, $(SRC_PATH):$(BUILD_DIR))
> ifdef CONFIG_LINUX
> QEMU_CFLAGS += -I../linux-headers
> endif
> --
> 2.4.6
>
ping http://patchwork.ozlabs.org/patch/510065/
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH] Makefile.target: include top level build dir in vpath
2015-09-07 21:02 ` Michael Marineau
@ 2015-09-07 21:11 ` Paolo Bonzini
2015-09-07 21:18 ` Michael Marineau
0 siblings, 1 reply; 7+ messages in thread
From: Paolo Bonzini @ 2015-09-07 21:11 UTC (permalink / raw)
To: Michael Marineau, qemu-devel
On 07/09/2015 23:02, Michael Marineau wrote:
> ping http://patchwork.ozlabs.org/patch/510065/
Just back from vacation, this is queued in my next pull request
(currently at tags/for-upstream on github.com/bonzini/qemu.git, but I
haven't finished testing it).
Paolo
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH] Makefile.target: include top level build dir in vpath
2015-09-07 21:11 ` Paolo Bonzini
@ 2015-09-07 21:18 ` Michael Marineau
0 siblings, 0 replies; 7+ messages in thread
From: Michael Marineau @ 2015-09-07 21:18 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel
On Mon, Sep 7, 2015 at 2:11 PM, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
>
> On 07/09/2015 23:02, Michael Marineau wrote:
>> ping http://patchwork.ozlabs.org/patch/510065/
>
> Just back from vacation, this is queued in my next pull request
> (currently at tags/for-upstream on github.com/bonzini/qemu.git, but I
> haven't finished testing it).
>
> Paolo
Great, thanks!
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-09-07 21:18 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-08-09 7:02 [Qemu-devel] [PATCH] Makefile.target: include top level build dir in vpath Michael Marineau
2015-08-12 13:32 ` Paolo Bonzini
2015-08-12 14:28 ` Michael Marineau
2015-08-24 0:57 ` Michael Marineau
2015-09-07 21:02 ` Michael Marineau
2015-09-07 21:11 ` Paolo Bonzini
2015-09-07 21:18 ` Michael Marineau
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.