Revert "libxl: Generate golang bindings in libxl Makefile"
PATCH 1/1 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.
---
This is a candidate to backport for 4.14.
I was doing prep for writing the infrastructure to create or update an external repo, and figured I might as well send this out now.
--- tools/golang/xenlight/Makefile | 9 --------- tools/libxl/Makefile | 17 +---------------- 2 files changed, 1 insertion(+), 25 deletions(-)
tools/golang/xenlight/Makefile +0 -9
@@ -13,15 +13,6 @@ LIBXL_SRC_DIR = ../../libxl .PHONY: all 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 $(LIBXL_SRC_DIR)/idl.py XEN_ROOT=$(XEN_ROOT) $(PYTHON) gengotypes.py $(LIBXL_SRC_DIR)/libxl_types.idl
tools/libxl/Makefile +1 -16
@@ -219,7 +219,7 @@ testidl.c: libxl_types.idl gentest.py libxl.h $(AUTOINCS) .PHONY: all all: $(CLIENTS) $(TEST_PROGS) $(PKG_CONFIG) $(PKG_CONFIG_LOCAL) \ libxenlight.so libxenlight.a libxlutil.so libxlutil.a \ - $(AUTOSRCS) $(AUTOINCS) idl-external + $(AUTOSRCS) $(AUTOINCS) $(LIBXL_OBJS) $(LIBXLU_OBJS) $(SAVE_HELPER_OBJS) \ $(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)_json.h,_libxl_type$(stem)_json.h) $(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 -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) $< $@
Signature · 1 line
2.25.1
Quoted 29 lines · George Dunlap
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 <[email protected]>---
This is a candidate to backport for 4.14.I was doing prep for writing the infrastructure to create or update an external repo, and figured I might as well send this out now.
CC Jan Beulich <[email protected]>CC Nick Rosbrook <[email protected]>CC Ian Jackson <[email protected]>CC Wei Liu <[email protected]>--- tools/golang/xenlight/Makefile | 9 --------- tools/libxl/Makefile | 17 +---------------- 2 files changed, 1 insertion(+), 25 deletions(-)tools/golang/xenlight/Makefile +0
-0
tools/golang/xenlight/Makefile LIBXL_SRC_DIR = ../../libxl · line 16
Quoted 4 lines
tools/golang/xenlight/Makefile +0
-1@@ -13,15 +13,6 @@ LIBXL_SRC_DIR = ../../libxl .PHONY: all all: build -GOXL_GEN_FILES = types.gen.go helpers.gen.go
The build target in golang/xenlight/Makefile still uses this variable after reverting this patch. $(GOXL_GEN_FILES) will be empty now, meaning make build will not re-generate *.gen.go if a change was made to gengotypes.py.
-NR
Quoted 37 lines · Nick Rosbrook
Quoted 32 lines · George Dunlap
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 <[email protected]>---
This is a candidate to backport for 4.14.I was doing prep for writing the infrastructure to create or update an external repo, and figured I might as well send this out now.
CC Jan Beulich <[email protected]>CC Nick Rosbrook <[email protected]>CC Ian Jackson <[email protected]>CC Wei Liu <[email protected]>---
tools/golang/xenlight/Makefile| 9 ---------tools/libxl/Makefile| 17 +----------------2 files changed, 1 insertion(+), 25 deletions(-)tools/golang/xenlight/Makefile +0
-0@@ -13,15 +13,6 @@ LIBXL_SRC_DIR = ../../libxl.PHONY: all
all: build
Quoted 5 lines
Quoted 1 line
-GOXL_GEN_FILES = types.gen.go helpers.gen.go
The build target in golang/xenlight/Makefile still uses this variable after reverting this patch. $(GOXL_GEN_FILES) will be empty now, meaning
make buildwill not re-generate *.gen.go if a change was made togengotypes.py.
Oops — good catch. v2 on the way.
-George