| Message ID | 20220225151321.44126-1-anthony.perard@citrix.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | Toolstack build system improvement, toward non-recursive makefiles | expand |
Hi, There's quite a few patch in this series that are reviewed and could be committed. The one reviewed don't depends on the other ones. The list I've gathered that I think are reviewed properly are: 11: tools/xenstore: Cleanup makefile 14: libs: rename LDUSELIBS to LDLIBS and use it instead of APPEND_LDFLAGS 15: libs: Remove need for *installlocal targets 16: libs,tools/include: Clean "clean" targets 17: libs: Rename $(SRCS-y) to $(OBJS-y) 18: libs/guest: rename ELF_OBJS to LIBELF_OBJS 19: libs/guest: rework CFLAGS 20: libs/store: use of -iquote instead of -I 21: libs/stat: Fix and rework python-bindings build 22: libs/stat: Fix and rework perl-binding build 24: stubdom: introduce xenlibs.mk 25: tools/libs: create Makefile.common to be used by stubdom build system 26: tools/xenstore: introduce Makefile.common to be used by stubdom 27: stubdom: build xenstore*-stubdom using new Makefile.common 28: stubdom: xenlibs linkfarm, ignore non-regular files 29: tools/ocaml: fix build dependency target (I didn't a run with them on our gitlab ci, and no build issue.) Thanks,
On 16/06/2022 14:32, Anthony PERARD wrote: > Hi, Hi Anthony, > There's quite a few patch in this series that are reviewed and could be > committed. The one reviewed don't depends on the other ones. > > The list I've gathered that I think are reviewed properly are: > > 11: tools/xenstore: Cleanup makefile > 14: libs: rename LDUSELIBS to LDLIBS and use it instead of APPEND_LDFLAGS > 15: libs: Remove need for *installlocal targets > 16: libs,tools/include: Clean "clean" targets > 17: libs: Rename $(SRCS-y) to $(OBJS-y) > 18: libs/guest: rename ELF_OBJS to LIBELF_OBJS > 19: libs/guest: rework CFLAGS > 20: libs/store: use of -iquote instead of -I > 21: libs/stat: Fix and rework python-bindings build > 22: libs/stat: Fix and rework perl-binding build > 24: stubdom: introduce xenlibs.mk > 25: tools/libs: create Makefile.common to be used by stubdom build system > 26: tools/xenstore: introduce Makefile.common to be used by stubdom > 27: stubdom: build xenstore*-stubdom using new Makefile.common > 28: stubdom: xenlibs linkfarm, ignore non-regular files > 29: tools/ocaml: fix build dependency target Committed. > > (I didn't a run with them on our gitlab ci, and no build issue.) I am guessing you mean you *did* a run? Cheers,
Hi Anthony, > On 16 Jun 2022, at 14:32, Anthony PERARD <anthony.perard@citrix.com> wrote: > > Hi, > > There's quite a few patch in this series that are reviewed and could be > committed. The one reviewed don't depends on the other ones. > > The list I've gathered that I think are reviewed properly are: > > 11: tools/xenstore: Cleanup makefile > 14: libs: rename LDUSELIBS to LDLIBS and use it instead of APPEND_LDFLAGS > 15: libs: Remove need for *installlocal targets > 16: libs,tools/include: Clean "clean" targets > 17: libs: Rename $(SRCS-y) to $(OBJS-y) > 18: libs/guest: rename ELF_OBJS to LIBELF_OBJS > 19: libs/guest: rework CFLAGS > 20: libs/store: use of -iquote instead of -I > 21: libs/stat: Fix and rework python-bindings build > 22: libs/stat: Fix and rework perl-binding build > 24: stubdom: introduce xenlibs.mk > 25: tools/libs: create Makefile.common to be used by stubdom build system > 26: tools/xenstore: introduce Makefile.common to be used by stubdom > 27: stubdom: build xenstore*-stubdom using new Makefile.common > 28: stubdom: xenlibs linkfarm, ignore non-regular files > 29: tools/ocaml: fix build dependency target > > (I didn't a run with them on our gitlab ci, and no build issue.) If you do not mind resend a v3 with the remaining patches rebase on staging, I can spend some time next week to test and review them. Maybe you can also put in the fixes for the header check. Cheers Bertrand
Patch series available in this git branch: https://xenbits.xen.org/git-http/people/aperard/xen-unstable.git br.toolstack-build-system-v2 Changes in v2: - one new patch - other changes described in patch notes Hi everyone, I've been looking at reworking the build system we have for the "tools/", and transforming it to something that suit it better. There are a lot of dependencies between different sub-directories so it would be nice if GNU make could actually handle them. This is possible with "non-recursive makefiles". With non-recursive makefiles, make will have to load/include all the makefiles and thus will have complete overview of all the dependencies. This will allow make to build the necessary targets in other directory, and we won't need to build sub-directories one by one. To help with this transformation, I've chosen to go with a recent project called "subdirmk". It help to deal with the fact that all makefiles will share the same namespace, it is hooked into autoconf, we can easily run `make` from any subdirectory. Together "autoconf" and "subdirmk" will also help to get closer to be able to do out-of-tree build of the tools, but I'm mainly looking to have non-recursive makefile. Link to the project: https://www.chiark.greenend.org.uk/ucgi/~ian/git/subdirmk.git/ But before getting to the main course, I've got quite a few cleanup and some changes to the makefiles. I start the patch series with patches that remove old left over stuff, then start reworking makefiles. They are some common changes like removing the "build" targets in many places as "all" would be the more common way to spell it and "all" is the default target anyway. They are other changes related to the conversion to "subdirmk", I start to use the variable $(TARGETS) in several makefiles, this variable will have a special meaning in subdirmk which will build those target by default. stubdom has some changes also as it won't be able to use tools/ Makefiles as-is anymore. As for the conversion to non-recursive makefile, with subdirmk, I have this WIP branch, it contains some changes that I'm trying out, some notes, and the conversion, one Makefile per commit. Cleanup are still needed, some makefile not converted yet, but it's otherwise mostly done. https://xenbits.xen.org/git-http/people/aperard/xen-unstable.git br.toolstack-build-system-v1-wip-extra With that branch, you could tried something like: ./configure; cd tools/xl; make and `xl` should be built as well as all the xen library needed. Also, things like `make clean` or rebuild should be faster in the all tools/ directory. Cheers, Anthony PERARD (29): tools/console: have one Makefile per program/directory tools/debugger/gdbsx: Fix and cleanup makefiles tools/examples: cleanup Makefile tools/firmware/hvmloader: rework Makefile tools/fuzz/libelf: rework makefile tools/fuzz/x86_instruction_emulator: rework makefile tools/helper: Cleanup Makefile tools/hotplug: cleanup Makefiles tools/libfsimage: Cleanup makefiles tools/xenpaging: Rework makefile tools/xenstore: Cleanup makefile tools/xentop: rework makefile tools/xentrace: rework Makefile libs: rename LDUSELIBS to LDLIBS and use it instead of APPEND_LDFLAGS libs: Remove need for *installlocal targets libs,tools/include: Clean "clean" targets libs: Rename $(SRCS-y) to $(OBJS-y) libs/guest: rename ELF_OBJS to LIBELF_OBJS libs/guest: rework CFLAGS libs/store: use of -iquote instead of -I libs/stat: Fix and rework python-bindings build libs/stat: Fix and rework perl-binding build .gitignore: Cleanup ignores of tools/libs/*/{headers.chk,*.pc} stubdom: introduce xenlibs.mk tools/libs: create Makefile.common to be used by stubdom build system tools/xenstore: introduce Makefile.common to be used by stubdom stubdom: build xenstore*-stubdom using new Makefile.common stubdom: xenlibs linkfarm, ignore non-regular files tools/ocaml: fix build dependency target stubdom/Makefile | 24 +- tools/Makefile | 2 +- tools/console/Makefile | 49 +--- tools/console/client/Makefile | 39 ++++ tools/console/daemon/Makefile | 50 +++++ tools/debugger/gdbsx/Makefile | 20 +- tools/debugger/gdbsx/gx/Makefile | 15 +- tools/debugger/gdbsx/xg/Makefile | 25 +-- tools/examples/Makefile | 25 +-- tools/firmware/hvmloader/Makefile | 16 +- tools/fuzz/libelf/Makefile | 21 +- tools/fuzz/x86_instruction_emulator/Makefile | 32 ++- tools/helpers/Makefile | 25 ++- tools/hotplug/FreeBSD/Makefile | 11 +- tools/hotplug/Linux/Makefile | 16 +- tools/hotplug/Linux/systemd/Makefile | 16 +- tools/hotplug/NetBSD/Makefile | 9 +- tools/hotplug/common/Makefile | 16 +- tools/include/Makefile | 1 + tools/include/xen-foreign/Makefile | 1 + tools/libfsimage/common/Makefile | 11 +- tools/libfsimage/ext2fs-lib/Makefile | 9 - tools/libfsimage/ext2fs/Makefile | 9 - tools/libfsimage/fat/Makefile | 9 - tools/libfsimage/iso9660/Makefile | 11 - tools/libfsimage/reiserfs/Makefile | 9 - tools/libfsimage/ufs/Makefile | 9 - tools/libfsimage/xfs/Makefile | 9 - tools/libfsimage/zfs/Makefile | 9 - tools/libs/call/Makefile | 7 +- tools/libs/ctrl/Makefile | 50 +---- tools/libs/devicemodel/Makefile | 7 +- tools/libs/evtchn/Makefile | 7 +- tools/libs/foreignmemory/Makefile | 7 +- tools/libs/gnttab/Makefile | 9 +- tools/libs/guest/Makefile | 100 +-------- tools/libs/hypfs/Makefile | 4 +- tools/libs/light/Makefile | 209 +++++++++--------- tools/libs/stat/Makefile | 72 +++--- tools/libs/store/Makefile | 18 +- tools/libs/toolcore/Makefile | 2 +- tools/libs/toollog/Makefile | 3 +- tools/libs/util/Makefile | 23 +- tools/libs/vchan/Makefile | 9 +- tools/ocaml/libs/eventchn/Makefile | 8 +- tools/ocaml/libs/mmap/Makefile | 8 +- tools/ocaml/libs/xb/Makefile | 8 +- tools/ocaml/libs/xc/Makefile | 8 +- tools/ocaml/libs/xentoollog/Makefile | 8 +- tools/ocaml/libs/xl/Makefile | 8 +- tools/ocaml/libs/xs/Makefile | 8 +- tools/xenpaging/Makefile | 24 +- tools/xenstore/Makefile | 94 +++----- tools/xentop/Makefile | 21 +- tools/xentrace/Makefile | 19 +- stubdom/xenlibs.mk | 13 ++ tools/libfsimage/Rules.mk | 26 +-- tools/libfsimage/common.mk | 11 + tools/libs/libs.mk | 17 +- tools/libs/guest/xg_offline_page.c | 2 +- tools/ocaml/Makefile.rules | 2 +- .gitignore | 35 --- tools/console/client/.gitignore | 1 + tools/console/daemon/.gitignore | 1 + tools/fuzz/libelf/.gitignore | 2 + .../fuzz/x86_instruction_emulator/.gitignore | 7 + tools/libs/.gitignore | 2 + tools/libs/call/Makefile.common | 6 + tools/libs/ctrl/Makefile.common | 44 ++++ tools/libs/devicemodel/Makefile.common | 6 + tools/libs/evtchn/Makefile.common | 6 + tools/libs/foreignmemory/Makefile.common | 6 + tools/libs/gnttab/Makefile.common | 8 + tools/libs/guest/Makefile.common | 84 +++++++ tools/libs/stat/bindings/swig/perl/.empty | 1 - tools/libs/stat/bindings/swig/python/.empty | 1 - tools/libs/toolcore/Makefile.common | 1 + tools/libs/toollog/Makefile.common | 2 + tools/xenstore/Makefile.common | 33 +++ 79 files changed, 732 insertions(+), 824 deletions(-) create mode 100644 tools/console/client/Makefile create mode 100644 tools/console/daemon/Makefile create mode 100644 stubdom/xenlibs.mk create mode 100644 tools/libfsimage/common.mk create mode 100644 tools/console/client/.gitignore create mode 100644 tools/console/daemon/.gitignore create mode 100644 tools/fuzz/libelf/.gitignore create mode 100644 tools/fuzz/x86_instruction_emulator/.gitignore create mode 100644 tools/libs/call/Makefile.common create mode 100644 tools/libs/ctrl/Makefile.common create mode 100644 tools/libs/devicemodel/Makefile.common create mode 100644 tools/libs/evtchn/Makefile.common create mode 100644 tools/libs/foreignmemory/Makefile.common create mode 100644 tools/libs/gnttab/Makefile.common create mode 100644 tools/libs/guest/Makefile.common delete mode 100644 tools/libs/stat/bindings/swig/perl/.empty delete mode 100644 tools/libs/stat/bindings/swig/python/.empty create mode 100644 tools/libs/toolcore/Makefile.common create mode 100644 tools/libs/toollog/Makefile.common create mode 100644 tools/xenstore/Makefile.common