summaryrefslogtreecommitdiffstats
path: root/core/modules/libvirt-src
diff options
context:
space:
mode:
authorSimon Rettberg2023-03-07 16:05:15 +0100
committerSimon Rettberg2023-03-07 16:05:15 +0100
commit42b420fbdbe013ffaed7f7ebdb39d08d09b67867 (patch)
tree1605420b15b73c39d3c54f608203acb752fb213d /core/modules/libvirt-src
parent[hardware-stats] Let any errors go to stdout (diff)
downloadmltk-42b420fbdbe013ffaed7f7ebdb39d08d09b67867.tar.gz
mltk-42b420fbdbe013ffaed7f7ebdb39d08d09b67867.tar.xz
mltk-42b420fbdbe013ffaed7f7ebdb39d08d09b67867.zip
Use distro meson
Diffstat (limited to 'core/modules/libvirt-src')
-rw-r--r--core/modules/libvirt-src/module.build4
-rw-r--r--core/modules/libvirt-src/module.conf.debian2
-rw-r--r--core/modules/libvirt-src/module.conf.ubuntu2
3 files changed, 2 insertions, 6 deletions
diff --git a/core/modules/libvirt-src/module.build b/core/modules/libvirt-src/module.build
index 61fd4567..b818b6a5 100644
--- a/core/modules/libvirt-src/module.build
+++ b/core/modules/libvirt-src/module.build
@@ -28,10 +28,6 @@ build() {
sed -i 's/-Wdeprecated-declarations/-Wno-deprecated-declarations/' meson.build
- # install meson (>= 0.54.0) since packaged version is too old
- # not 0.60 as of now, https://github.com/mesonbuild/meson/issues/9472
- pip3 install "meson==0.56.0"
-
meson build \
--prefix="/usr" \
--sysconfdir="/etc" \
diff --git a/core/modules/libvirt-src/module.conf.debian b/core/modules/libvirt-src/module.conf.debian
index 11c11507..c5edc77f 100644
--- a/core/modules/libvirt-src/module.conf.debian
+++ b/core/modules/libvirt-src/module.conf.debian
@@ -2,7 +2,7 @@
REQUIRED_INSTALLED_PACKAGES="
gcc
python3
- python3-pip
+ meson
ninja-build
bash-completion
debhelper
diff --git a/core/modules/libvirt-src/module.conf.ubuntu b/core/modules/libvirt-src/module.conf.ubuntu
index 11c11507..c5edc77f 100644
--- a/core/modules/libvirt-src/module.conf.ubuntu
+++ b/core/modules/libvirt-src/module.conf.ubuntu
@@ -2,7 +2,7 @@
REQUIRED_INSTALLED_PACKAGES="
gcc
python3
- python3-pip
+ meson
ninja-build
bash-completion
debhelper