[PATCH 0/2] Fix problems with local pkg-config files.

Daniel P. Berrangé (2): src: add missing libvirt-admin.pc.in for local usage src: fix package name in local pkg-config files src/libvirt-admin.pc.in | 19 +++++++++++++++++++ src/libvirt-lxc.pc.in | 2 +- src/libvirt-qemu.pc.in | 2 +- src/meson.build | 1 + 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 src/libvirt-admin.pc.in -- 2.49.0

From: Daniel P. Berrangé <berrange@redhat.com> When using the 'run' script, we point pkg-config to files in $BUILD/src, which resolve to the local build tree. Unfortunately we forgot a libvirt-admin.pc.in, so the run script was not taking effect for the admin APIs. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/libvirt-admin.pc.in | 19 +++++++++++++++++++ src/meson.build | 1 + 2 files changed, 20 insertions(+) create mode 100644 src/libvirt-admin.pc.in diff --git a/src/libvirt-admin.pc.in b/src/libvirt-admin.pc.in new file mode 100644 index 0000000000..e5ee5eb05f --- /dev/null +++ b/src/libvirt-admin.pc.in @@ -0,0 +1,19 @@ +# Dummy pkg-config file to allow lang bindings +# to build against a libvirt source tree eg +# export PKG_CONFIG_PATH=/path/to/libvirt/git/src + +prefix=@abs_top_builddir@ +exec_prefix=@abs_top_builddir@ +libdir=@abs_top_builddir@/src +includedir=@abs_top_builddir@/include +source_includedir=@abs_top_srcdir@/include +datarootdir=@abs_top_builddir@ + +libvirt_admin_api=@abs_top_builddir@/docs/libvirt-admin-api.xml + +Name: libvirt-admin +Version: @VERSION@ +Description: libvirt admin library +Requires: +Libs: -L${libdir} -lvirt-admin +Cflags: -I${includedir} -I${source_includedir} diff --git a/src/meson.build b/src/meson.build index 9a818dab50..47c978cc1f 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1110,6 +1110,7 @@ endif run_pkg_config_files = [ 'libvirt-lxc.pc.in', 'libvirt-qemu.pc.in', + 'libvirt-admin.pc.in', 'libvirt.pc.in', ] -- 2.49.0

From: Daniel P. Berrangé <berrange@redhat.com> The libvirt-lxc.pc.in and libvirt-qemu.pc.in files had the incorrect package name, though fortunately this appears to have been a harmless mistake. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- src/libvirt-lxc.pc.in | 2 +- src/libvirt-qemu.pc.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libvirt-lxc.pc.in b/src/libvirt-lxc.pc.in index f6d4dd71e7..c6497ea421 100644 --- a/src/libvirt-lxc.pc.in +++ b/src/libvirt-lxc.pc.in @@ -11,7 +11,7 @@ datarootdir=@abs_top_builddir@ libvirt_lxc_api=@abs_top_builddir@/docs/libvirt-lxc-api.xml -Name: libvirt +Name: libvirt-lxc Version: @VERSION@ Description: libvirt LXC library Requires: diff --git a/src/libvirt-qemu.pc.in b/src/libvirt-qemu.pc.in index b224679d7e..5169771e9b 100644 --- a/src/libvirt-qemu.pc.in +++ b/src/libvirt-qemu.pc.in @@ -11,7 +11,7 @@ datarootdir=@abs_top_builddir@ libvirt_qemu_api=@abs_top_builddir@/docs/libvirt-qemu-api.xml -Name: libvirt +Name: libvirt-qemu Version: @VERSION@ Description: libvirt QEMU library Requires: -- 2.49.0
participants (2)
-
Daniel P. Berrangé
-
Peter Krempa