aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2012-02-14 12:55:36 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2012-02-14 13:00:21 +0000
commit320dc3d9ea4a18650453ee19eae4efd971276fae (patch)
tree7c5607a00863ed155de949030ce8551387a945a6 /main
parenteb75de6ad47871fef45c8f92a9cf6f9f1e38d9e9 (diff)
downloadaports-320dc3d9ea4a18650453ee19eae4efd971276fae.tar.bz2
aports-320dc3d9ea4a18650453ee19eae4efd971276fae.tar.xz
main/libvirt: upgrade to v0.9.10
Removed unused patch. Added "-lm" to linker flags due to unresolved symbol "__isnan" while building on ulibc-0.9.33.
Diffstat (limited to 'main')
-rw-r--r--main/libvirt/APKBUILD6
-rw-r--r--main/libvirt/fix_undefined_symbol_error_when_macvtap_support_is_disabled.patch117
2 files changed, 3 insertions, 120 deletions
diff --git a/main/libvirt/APKBUILD b/main/libvirt/APKBUILD
index 0fabadda71..570567fec4 100644
--- a/main/libvirt/APKBUILD
+++ b/main/libvirt/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=libvirt
-pkgver=0.9.9
+pkgver=0.9.10
pkgrel=0
pkgdesc="A virtualization API for several hypervisor and container systems"
url="http://libvirt.org/"
@@ -22,12 +22,12 @@ _builddir="$srcdir"/$pkgname-$pkgver
prepare() {
cd "$_builddir"
-# patch -p1 < ../fix_undefined_symbol_error_when_macvtap_support_is_disabled.patch || return 1
return 0
}
build() {
cd "$_builddir"
+ export LDFLAGS="$LDFLAGS -lm"
./configure --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
@@ -44,6 +44,6 @@ package() {
install -D -m755 $srcdir/$pkgname.confd $pkgdir/etc/conf.d/libvirtd
}
-md5sums="37c4bf8cdd4c76150bc0c1d249945d27 libvirt-0.9.9.tar.gz
+md5sums="a424bb793521e637349da47e93dd5fff libvirt-0.9.10.tar.gz
1c84a7baeafe0a7f4e9d7ae5180311b7 libvirt.confd
7067215010da2d7282d878ba43070c5d libvirt.initd"
diff --git a/main/libvirt/fix_undefined_symbol_error_when_macvtap_support_is_disabled.patch b/main/libvirt/fix_undefined_symbol_error_when_macvtap_support_is_disabled.patch
deleted file mode 100644
index c00d38bd1f..0000000000
--- a/main/libvirt/fix_undefined_symbol_error_when_macvtap_support_is_disabled.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff --git a/src/libvirt_macvtap.syms b/src/libvirt_macvtap.syms
-index 107b7da..b48565b 100644
---- a/src/libvirt_macvtap.syms
-+++ b/src/libvirt_macvtap.syms
-@@ -1,9 +1,10 @@
- #
-+# These symbols are dependent on WITH_MACVTAP.
-+#
-+
-
- # macvtap.h
- delMacvtap;
- openMacvtapTap;
--virVMOperationTypeFromString;
--virVMOperationTypeToString;
- vpAssociatePortProfileId;
- vpDisassociatePortProfileId;
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 310d8f4..3c1c823 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -504,6 +504,11 @@ virLogStartup;
- virLogUnlock;
-
-
-+# macvtap.h
-+virVMOperationTypeFromString;
-+virVMOperationTypeToString;
-+
-+
- # memory.h
- virAlloc;
- virAllocN;
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index fcb90a3..aa3478f 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -11879,6 +11879,7 @@ cleanup:
- return ret;
- }
-
-+#if WITH_MACVTAP
- static void
- qemudVPAssociatePortProfiles(virDomainDefPtr def) {
- int i;
-@@ -11913,6 +11914,7 @@ err_exit:
- }
- }
- }
-+#endif /* WITH_MACVTAP */
-
- /* Finish is the third and final step, and it runs on the destination host. */
- static virDomainPtr
-@@ -11974,7 +11976,9 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn,
- goto cleanup;
- }
-
-+#if WITH_MACVTAP
- qemudVPAssociatePortProfiles(vm->def);
-+#endif /* WITH_MACVTAP */
-
- if (flags & VIR_MIGRATE_PERSIST_DEST) {
- if (vm->persistent)
-diff --git a/src/util/macvtap.h b/src/util/macvtap.h
-index 389d1fd..3ae2c24 100644
---- a/src/util/macvtap.h
-+++ b/src/util/macvtap.h
-@@ -57,11 +57,6 @@ struct _virVirtualPortProfileParams {
- } u;
- };
-
--
--# if defined(WITH_MACVTAP)
--
--# include "internal.h"
--
- enum virVMOperationType {
- VIR_VM_OP_CREATE,
- VIR_VM_OP_SAVE,
-@@ -75,6 +70,10 @@ enum virVMOperationType {
- VIR_VM_OP_LAST
- };
-
-+# if WITH_MACVTAP
-+
-+# include "internal.h"
-+
- int openMacvtapTap(const char *ifname,
- const unsigned char *macaddress,
- const char *linkdev,
-@@ -90,11 +89,9 @@ void delMacvtap(const char *ifname,
- const char *linkdev,
- virVirtualPortProfileParamsPtr virtPortProfile);
-
--# endif /* WITH_MACVTAP */
--
--# define MACVTAP_MODE_PRIVATE_STR "private"
--# define MACVTAP_MODE_VEPA_STR "vepa"
--# define MACVTAP_MODE_BRIDGE_STR "bridge"
-+# define MACVTAP_MODE_PRIVATE_STR "private"
-+# define MACVTAP_MODE_VEPA_STR "vepa"
-+# define MACVTAP_MODE_BRIDGE_STR "bridge"
-
- int vpAssociatePortProfileId(const char *macvtap_ifname,
- const unsigned char *macvtap_macaddr,
-@@ -109,6 +106,8 @@ int vpDisassociatePortProfileId(const char *macvtap_ifname,
- const virVirtualPortProfileParamsPtr virtPort,
- enum virVMOperationType vmOp);
-
-+# endif /* WITH_MACVTAP */
-+
- VIR_ENUM_DECL(virVirtualPort)
- VIR_ENUM_DECL(virVMOperation)
-
---
-1.7.0.4
-