On Mon, Jun 05, 2023 at 11:52:18AM +0200, Paolo Bonzini wrote: > Compared to submodules, .wrap files have several advantages: > > * option parsing and downloading is delegated to meson > > * the commit is stored in a text file instead of a magic entry in the > git tree object > > * we could stop shipping external dependencies that are only used as a > fallback, but not break compilation on platforms that lack them. > For example it may make sense to download dtc at build time, controlled > by --enable-download, even when building from a tarball. Right now, > this patch does the opposite: make-release treats dtc like libvfio-user > (which is not stable API and therefore hasn't found its way into any > distros) and keycodemap (which is a copylib, for better or worse). > > dependency() can fall back to a wrap automatically. However, this > is only possible for libraries that come with a .pc file, and this > is not very common for libfdt even though the upstream project in > principle provides it; it also removes the control that we provide with > --enable-fdt={system,internal}. Therefore, the logic to pick system > vs. internal libfdt is left untouched. > > --enable-fdt=git is removed; it was already a synonym for > --enable-fdt=internal. > > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > --- > .gitlab-ci.d/buildtest-template.yml | 1 + > .gitmodules | 9 ---- > configure | 77 ++++++++++++----------------- > meson.build | 15 +----- > scripts/archive-source.sh | 11 ++++- > scripts/make-release | 5 ++ > subprojects/.gitignore | 3 ++ > subprojects/dtc | 1 - > subprojects/dtc.wrap | 4 ++ > subprojects/keycodemapdb | 1 - > subprojects/keycodemapdb.wrap | 4 ++ > subprojects/libvfio-user | 1 - > subprojects/libvfio-user.wrap | 4 ++ > 13 files changed, 63 insertions(+), 73 deletions(-) > delete mode 160000 subprojects/dtc > create mode 100644 subprojects/dtc.wrap > delete mode 160000 subprojects/keycodemapdb > create mode 100644 subprojects/keycodemapdb.wrap > delete mode 160000 subprojects/libvfio-user > create mode 100644 subprojects/libvfio-user.wrap
Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|