[ovs-dev] [PATCH 1/2] Fix vswitch-idl.ovsidl build rule with separate source and build dirs.
ethan at nicira.com
Thu Oct 4 23:16:08 UTC 2012
Hmm strange, this worked for me without the patch when I tried
building from an alternative directory. At any rate, thanks for
fixing this. s/change/chance in the commit message and it's good.
Acked-by: Ethan Jackson <ethan at nicira.com>
On Thu, Oct 4, 2012 at 3:55 PM, Ben Pfaff <blp at nicira.com> wrote:
> Before commit e3a880272 (lib: Specify idl location more precisely.), the
> files named in VSWITCH_IDL_FILES were relative to the source directory.
> That commit made them inconsistent: one remained relative to the source
> directory, the other became relative to the build directory. This meant
> that if the source and build directories differed, the ovsdb-idlc
> invocation had no change of succeeding.
> This commit fixes the problem by making the file names consistently
> relative to the build directory and then adjusting the ovsdb-idlc
> invocation to expect that.
> Signed-off-by: Ben Pfaff <blp at nicira.com>
> lib/automake.mk | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
> diff --git a/lib/automake.mk b/lib/automake.mk
> index a45f09d..d5927d6 100644
> --- a/lib/automake.mk
> +++ b/lib/automake.mk
> @@ -305,9 +305,11 @@ OVSIDL_BUILT += \
> EXTRA_DIST += $(srcdir)/lib/vswitch-idl.ann
> -VSWITCH_IDL_FILES = vswitchd/vswitch.ovsschema $(srcdir)/lib/vswitch-idl.ann
> +VSWITCH_IDL_FILES = \
> + $(srcdir)/vswitchd/vswitch.ovsschema \
> + $(srcdir)/lib/vswitch-idl.ann
> $(srcdir)/lib/vswitch-idl.ovsidl: $(VSWITCH_IDL_FILES)
> - $(OVSDB_IDLC) -C $(srcdir) annotate $(VSWITCH_IDL_FILES) > $@.tmp
> + $(OVSDB_IDLC) annotate $(VSWITCH_IDL_FILES) > $@.tmp
> mv $@.tmp $@
> lib/dirs.c: lib/dirs.c.in Makefile
> dev mailing list
> dev at openvswitch.org
More information about the dev