diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2016-10-23 01:12:22 +0200 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2016-10-23 01:12:22 +0200 |
| commit | a3e3a29bdcaff516d8e03d2dac42ae9525941663 (patch) | |
| tree | 68b8844058a8db2c179f4f2dd5d5323c4669c1d4 /main/libvirt | |
| parent | 0407adaf4f3458f8e6f63984dd647d0fcb55b9fc (diff) | |
| download | aports-a3e3a29bdcaff516d8e03d2dac42ae9525941663.tar.bz2 aports-a3e3a29bdcaff516d8e03d2dac42ae9525941663.tar.xz | |
main/libvirt: cleanup and set QEMU_BRIDGE_HELPER path
Diffstat (limited to 'main/libvirt')
| -rw-r--r-- | main/libvirt/APKBUILD | 43 |
1 files changed, 9 insertions, 34 deletions
diff --git a/main/libvirt/APKBUILD b/main/libvirt/APKBUILD index 687c51376c..b317a0308f 100644 --- a/main/libvirt/APKBUILD +++ b/main/libvirt/APKBUILD @@ -2,7 +2,7 @@ pkgname=libvirt pkgver=2.3.0 _ver="${pkgver/_rc/-rc}" -pkgrel=0 +pkgrel=1 pkgdesc="A virtualization API for several hypervisor and container systems" url="http://libvirt.org/" arch="all" @@ -18,7 +18,6 @@ makedepends="augeas-dev bridge-utils cyrus-sasl-dev device-mapper eudev-dev zlib-dev yajl-dev libpcap-dev curl-dev libpciaccess-dev polkit-dev readline-dev dnsmasq linux-headers $depends_dev fuse-dev util-linux $_daemon_deps $_client_deps - automake autoconf libtool " install="$pkgname.post-install" subpackages="$pkgname-dev $pkgname-doc $pkgname-client $pkgname-daemon @@ -38,37 +37,13 @@ if [ "$CARCH" = "x86_64" ]; then fi subpackages="$subpackages $pkgname-common-drivers:_common_drivers" -_builddir="$srcdir"/$pkgname-$pkgver - -prepare() { - cd "$_builddir" || return 1 - for patch in $source; do - case $patch in - # we concider patches with uclibc in its name - # only usefull on uclibc install - *uclibc*.patch) - if [ "$ALPINE_LIBC" != "eglibc" ]; then - msg "Applying patch $patch" - patch -p1 -i "$srcdir"/$patch || return 1 - fi - ;; - *.patch) - msg "Applying patch $patch" - patch -p1 -i "$srcdir"/$patch || return 1 - ;; - esac - done - autoreconf -vif || return 1 -} +builddir="$srcdir"/$pkgname-$pkgver build() { - cd "$_builddir" - export CFLAGS="$CFLAGS `pkgconf --cflags libtirpc`" - export LDFLAGS="$LDFLAGS -lm `pkgconf --libs libtirpc`" - local _xen_opt= - if [ "$CARCH" = x86_64 ]; then - _xen_opt="--with-libxl" - fi + cd "$builddir" + # qemu sets libexec dir to /usr/lib/qemu + export ac_cv_path_QEMU_BRIDGE_HELPER="/usr/lib/qemu/qemu-bridge-helper" + [ "$CARCH" = x86_64 ] && local _xen_opt="--with-libxl" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -85,7 +60,7 @@ build() { } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" install || return 1 install -D -m755 $srcdir/$pkgname.initd $pkgdir/etc/init.d/libvirtd install -D -m755 $srcdir/$pkgname.confd $pkgdir/etc/conf.d/libvirtd @@ -108,7 +83,7 @@ dev() { } daemon() { - cd "$_builddir" + cd "$builddir" pkgdesc="libvirt daemon package" depends="libvirt-client $_daemon_deps" replaces="libvirt" @@ -124,7 +99,7 @@ daemon() { } client() { - cd "$_builddir" + cd "$builddir" pkgdesc="libvirt client package" depends="libvirt $_client_deps" replaces="libvirt" |