summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Bezies2020-08-05 08:12:04 +0200
committerFrederic Bezies2020-08-05 08:12:04 +0200
commitcff96f876e903fcfdf941b604786dc7fba117e0a (patch)
treefd374a283ad9e03b1808622d582027fd9b49095a
parent526c997d9b688b2b994b73121dd0f237684a4d46 (diff)
downloadaur-cff96f876e903fcfdf941b604786dc7fba117e0a.tar.gz
ninja build migration
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD20
2 files changed, 10 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 77c02912b14..793e23a3f56 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = libvirt-git
pkgdesc = API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)
- pkgver = 6.6.0.r30.g7f9b214711
+ pkgver = 6.6.0.r487.gd293a556d7
pkgrel = 1
url = http://libvirt.org/
install = libvirt.install
@@ -22,6 +22,8 @@ pkgbase = libvirt-git
makedepends = iproute2
makedepends = qemu-headless
makedepends = git
+ makedepends = meson
+ makedepends = ninja
depends = libpciaccess
depends = yajl
depends = fuse2
diff --git a/PKGBUILD b/PKGBUILD
index d72ea38ef59..a030a38f2f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
# Contributor: Jonathan Wiersma <archaur at jonw dot org>
pkgname=libvirt-git
-pkgver=6.6.0.r30.g7f9b214711
+pkgver=6.6.0.r487.gd293a556d7
pkgrel=1
pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ url="http://libvirt.org/"
license=('LGPL' 'GPL3')
depends=('libpciaccess' 'yajl' 'fuse2' 'gnutls' 'parted' 'libssh' 'libxml2' 'numactl' 'polkit' 'netcf')
makedepends=('libxslt' 'python-docutils' 'lvm2' 'open-iscsi' 'libiscsi' 'ceph-libs' 'glusterfs'
- 'bash-completion' 'rpcsvc-proto' 'dnsmasq' 'iproute2' 'qemu-headless' 'git')
+ 'bash-completion' 'rpcsvc-proto' 'dnsmasq' 'iproute2' 'qemu-headless' 'git' 'meson' 'ninja')
checkdepends=('ebtables')
optdepends=('libvirt-storage-gluster: Gluster storage backend'
'libvirt-storage-iscsi-direct: iSCSI-direct storage backend'
@@ -129,23 +129,17 @@ build() {
export PYTHON=`which python`
export LDFLAGS=-lX11
export RADVD=/usr/bin/radvd
- NOCONFIGURE=1 ./autogen.sh
- sed -i 's|libsystemd-daemon|libsystemd|g' configure
+ #sed -i 's|libsystemd-daemon|libsystemd|g' configure
mkdir build && cd build
-
- [ -f Makefile ] || ../configure --prefix=/usr --libexec=/usr/lib/"${pkgname/-git/}" --sbindir=/usr/bin \
- --with-storage-lvm --with-udev --without-hal --disable-static \
- --with-init-script=systemd \
- --with-qemu-user=nobody --with-qemu-group=nobody \
- --with-netcf --with-interface \
- --without-wireshark-dissector # working around bug 63828
- make
+
+ meson --prefix=/usr --sysconfdir=/etc -Dsystem=true
+ ninja
}
package() {
cd "$srcdir/${pkgname/-git/}/build"
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja install
install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd
install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirt-guests