Use distro meson

12 files changed, 8 insertions, 22 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
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
diff --git a/core/modules/qemu-src/module.build b/core/modules/qemu-src/module.build
index f8646f09..69736c0f 100644
--- a/core/modules/qemu-src/module.build
+++ b/core/modules/qemu-src/module.build
@@ -23,9 +23,6 @@ build() {
 	local DSTDIR="${MODULE_BUILD_DIR}"
 	cde "${SRCDIR}"
 
-	# install meson (>= 0.54.0) since packaged version is too old
-	pip3 install "meson>=0.54.0"
-
 	./configure \
 		--prefix="/usr" \
 		--sysconfdir="/etc" \
diff --git a/core/modules/qemu-src/module.conf.debian b/core/modules/qemu-src/module.conf.debian
index df5dd534..3e43d539 100644
--- a/core/modules/qemu-src/module.conf.debian
+++ b/core/modules/qemu-src/module.conf.debian
@@ -4,7 +4,7 @@ REQUIRED_INSTALLED_PACKAGES="
 	debhelper
 	device-tree-compiler
 	python3
-	python3-pip
+	meson
 	ninja-build
 	libaio-dev
 	libpulse-dev
diff --git a/core/modules/qemu-src/module.conf.ubuntu b/core/modules/qemu-src/module.conf.ubuntu
index df5dd534..3e43d539 100644
--- a/core/modules/qemu-src/module.conf.ubuntu
+++ b/core/modules/qemu-src/module.conf.ubuntu
@@ -4,7 +4,7 @@ REQUIRED_INSTALLED_PACKAGES="
 	debhelper
 	device-tree-compiler
 	python3
-	python3-pip
+	meson
 	ninja-build
 	libaio-dev
 	libpulse-dev
diff --git a/core/modules/virt-viewer/module.build b/core/modules/virt-viewer/module.build
index 61f7e18b..d37d750e 100644
--- a/core/modules/virt-viewer/module.build
+++ b/core/modules/virt-viewer/module.build
@@ -8,9 +8,6 @@ build() {
 	local DSTDIR="${MODULE_BUILD_DIR}"
 	cde "${SRCDIR}"
 
-	# install meson (>= 0.54.0) since packaged version is too old
-	pip3 install "meson==0.56.0"
-
 	# save original path content before modifying path variable
 	local PATH_OLD="${PATH}"
 
diff --git a/core/modules/virt-viewer/module.conf.debian b/core/modules/virt-viewer/module.conf.debian
index 434612d4..0e1564ac 100644
--- a/core/modules/virt-viewer/module.conf.debian
+++ b/core/modules/virt-viewer/module.conf.debian
@@ -2,7 +2,7 @@
 REQUIRED_INSTALLED_PACKAGES="
 	gcc
 	python3
-	python3-pip
+	meson
 	ninja-build
 	debhelper
 	libgovirt-dev
diff --git a/core/modules/virt-viewer/module.conf.ubuntu b/core/modules/virt-viewer/module.conf.ubuntu
index 434612d4..0e1564ac 100644
--- a/core/modules/virt-viewer/module.conf.ubuntu
+++ b/core/modules/virt-viewer/module.conf.ubuntu
@@ -2,7 +2,7 @@
 REQUIRED_INSTALLED_PACKAGES="
 	gcc
 	python3
-	python3-pip
+	meson
 	ninja-build
 	debhelper
 	libgovirt-dev