[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen staging] Revert "libxl: Generate golang bindings in libxl Makefile"

commit ac7a21cf5c125810ee0193338a0f710cba0ab079
Author:     George Dunlap <george.dunlap@xxxxxxxxxx>
AuthorDate: Fri Aug 28 15:33:37 2020 +0100
Commit:     George Dunlap <george.dunlap@xxxxxxxxxx>
CommitDate: Fri Sep 4 15:38:56 2020 +0100

    Revert "libxl: Generate golang bindings in libxl Makefile"
    This reverts commit 60db5da62ac051aab0b217fa2d96acca1cd3ca3e.
    This is in preparation for the planned move to hosting the xenlight
    package in a separate repo.
    This also fixes a regression when building with a read-only source and
    an out-of-tree build.
    Signed-off-by: George Dunlap <george.dunlap@xxxxxxxxxx>
    Acked-by: Nick Rosbrook <rosbrookn@xxxxxxxxxxxx>
 tools/golang/xenlight/Makefile |  7 -------
 tools/libxl/Makefile           | 17 +----------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/tools/golang/xenlight/Makefile b/tools/golang/xenlight/Makefile
index a83fff7573..b17095e64b 100644
--- a/tools/golang/xenlight/Makefile
+++ b/tools/golang/xenlight/Makefile
@@ -15,13 +15,6 @@ all: build
 GOXL_GEN_FILES = types.gen.go helpers.gen.go
-# NOTE: This target is called from libxl/Makefile:all.  Since that
-# target must finish before golang/Makefile is called, this is
-# currently safe.  It must not be called from anywhere else in the
-# Makefile system without careful thought about races with
-# xenlight/Makefile:all
-idl-gen: $(GOXL_GEN_FILES)
 %.gen.go: gengotypes.py $(LIBXL_SRC_DIR)/libxl_types.idl 
        XEN_ROOT=$(XEN_ROOT) $(PYTHON) gengotypes.py 
diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index 0e8dfc6193..c26b3a8093 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -219,7 +219,7 @@ testidl.c: libxl_types.idl gentest.py libxl.h $(AUTOINCS)
 .PHONY: all
                libxenlight.so libxenlight.a libxlutil.so libxlutil.a \
-       $(AUTOSRCS) $(AUTOINCS) idl-external
                $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS): \
@@ -275,21 +275,6 @@ _libxl_type%.h _libxl_type%_json.h _libxl_type%_private.h 
_libxl_type%.c: libxl_
        $(call move-if-changed,__libxl_type$(stem).c,_libxl_type$(stem).c)
-# NOTE: This is safe to do at the moment because idl-external and
-# idl-gen are only called from libxl/Makefile:all, which must return
-# before golang/Makefile is callid.  idl-external and idl-gen must
-# never be called from another part of the make system without careful thought
-# about races with tools/golang/xenlight/Makefile:all
-.PHONY: idl-external
-       $(MAKE) -C $(XEN_ROOT)/tools/golang/xenlight idl-gen
-LIBXL_IDLGEN_FILES = _libxl_types.h _libxl_types_json.h _libxl_types_private.h 
_libxl_types.c \
-       _libxl_types_internal.h _libxl_types_internal_json.h 
_libxl_types_internal_private.h _libxl_types_internal.c
-idl-gen: $(LIBXL_GEN_FILES) idl-external
 libxenlight.so: libxenlight.so.$(MAJOR)
        $(SYMLINK_SHLIB) $< $@
generated by git-patchbot for /home/xen/git/xen.git#staging



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.