From 42b420fbdbe013ffaed7f7ebdb39d08d09b67867 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 7 Mar 2023 16:05:15 +0100 Subject: Use distro meson --- core/modules/qemu-src/module.build | 3 --- core/modules/qemu-src/module.conf.debian | 2 +- core/modules/qemu-src/module.conf.ubuntu | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'core/modules/qemu-src') 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 -- cgit v1.2.3-55-g7522