diff options
| author | Simon Rettberg | 2023-03-07 16:05:15 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2023-03-07 16:05:15 +0100 |
| commit | 42b420fbdbe013ffaed7f7ebdb39d08d09b67867 (patch) | |
| tree | 1605420b15b73c39d3c54f608203acb752fb213d /core/modules/libvirt-glib | |
| parent | [hardware-stats] Let any errors go to stdout (diff) | |
| download | mltk-42b420fbdbe013ffaed7f7ebdb39d08d09b67867.tar.gz mltk-42b420fbdbe013ffaed7f7ebdb39d08d09b67867.tar.xz mltk-42b420fbdbe013ffaed7f7ebdb39d08d09b67867.zip | |
Use distro meson
Diffstat (limited to 'core/modules/libvirt-glib')
| -rw-r--r-- | core/modules/libvirt-glib/module.build | 4 | ||||
| -rw-r--r-- | core/modules/libvirt-glib/module.conf.debian | 2 | ||||
| -rw-r--r-- | core/modules/libvirt-glib/module.conf.ubuntu | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/core/modules/libvirt-glib/module.build b/core/modules/libvirt-glib/module.build index 07320f7d..80529231 100644 --- a/core/modules/libvirt-glib/module.build +++ b/core/modules/libvirt-glib/module.build @@ -8,10 +8,6 @@ build() { local DSTDIR="${MODULE_BUILD_DIR}" cde "${SRCDIR}" - # install meson (>= 0.54.0) since packaged version is too old - # Force 0.55 for now: https://github.com/mesonbuild/meson/issues/9472 - pip3 install "meson==0.56.0" - local LIBVIRT_SRCDIR="${MODULE_WORK_DIR}/../libvirt-src/src/libvirt" PKG_CONFIG_PATH="${LIBVIRT_SRCDIR}/build/src" meson build \ --prefix="/usr" \ diff --git a/core/modules/libvirt-glib/module.conf.debian b/core/modules/libvirt-glib/module.conf.debian index f339f37a..64c42a40 100644 --- a/core/modules/libvirt-glib/module.conf.debian +++ b/core/modules/libvirt-glib/module.conf.debian @@ -1,7 +1,7 @@ #!/bin/bash REQUIRED_INSTALLED_PACKAGES=" python3 - python3-pip + meson debhelper dh-python intltool diff --git a/core/modules/libvirt-glib/module.conf.ubuntu b/core/modules/libvirt-glib/module.conf.ubuntu index f339f37a..64c42a40 100644 --- a/core/modules/libvirt-glib/module.conf.ubuntu +++ b/core/modules/libvirt-glib/module.conf.ubuntu @@ -1,7 +1,7 @@ #!/bin/bash REQUIRED_INSTALLED_PACKAGES=" python3 - python3-pip + meson debhelper dh-python intltool |