diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-12-18 15:31:43 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-12-18 15:32:17 +0000 |
| commit | 9dd23710883316940b74244850e2ca2515a69c07 (patch) | |
| tree | 28b287675073dd9aef2290d09c0fc8981042526e | |
| parent | fbd7499460f0269252dfe21b0d7da3881d60bb16 (diff) | |
| download | aports-9dd23710883316940b74244850e2ca2515a69c07.tar.bz2 aports-9dd23710883316940b74244850e2ca2515a69c07.tar.xz | |
main/libvirt: fix musl build
| -rw-r--r-- | main/libvirt/APKBUILD | 16 | ||||
| -rw-r--r-- | main/libvirt/musl-fix-includes.patch | 10 |
2 files changed, 22 insertions, 4 deletions
diff --git a/main/libvirt/APKBUILD b/main/libvirt/APKBUILD index e1141dc596..3f009e5b69 100644 --- a/main/libvirt/APKBUILD +++ b/main/libvirt/APKBUILD @@ -2,7 +2,7 @@ pkgname=libvirt pkgver=1.2.0 _ver="${pkgver/_rc/-rc}" -pkgrel=1 +pkgrel=2 pkgdesc="A virtualization API for several hypervisor and container systems" url="http://libvirt.org/" arch="all" @@ -25,6 +25,7 @@ source="http://libvirt.org/sources/$pkgname-$pkgver.tar.gz libvirt.confd libvirt.initd uclibc-physmem.patch + musl-fix-includes.patch " if [ "$CARCH" = "x86_64" ]; then @@ -83,6 +84,10 @@ package() { find "$pkgdir" -name '*.la' -delete install -D -m755 $srcdir/$pkgname.initd $pkgdir/etc/init.d/libvirtd install -D -m755 $srcdir/$pkgname.confd $pkgdir/etc/conf.d/libvirtd + + rm -rf "$pkgdir"/usr/lib/charset.alias + rmdir -p "$pkgdir"/usr/lib 2>/dev/null + return 0 } dev() { @@ -164,12 +169,15 @@ _common_drivers() { md5sums="f74f78059def4e68d69b975ad6e6c3e2 libvirt-1.2.0.tar.gz 1c84a7baeafe0a7f4e9d7ae5180311b7 libvirt.confd d897df38c7e7fa1a297aa551108633c9 libvirt.initd -df9cbfaf8a6e520a4822914a300add4d uclibc-physmem.patch" +df9cbfaf8a6e520a4822914a300add4d uclibc-physmem.patch +9da7723b114b2d87558e92828366fbcb musl-fix-includes.patch" sha256sums="a8e578ae7861db2ac5f454073293d2ef3229fd3f6c4f9029101763244db22ddd libvirt-1.2.0.tar.gz 851ab3f9678f0fa9c3ee03f7fc7bd00c4ee86d5f0777eecf9eb1ffe3243adfd1 libvirt.confd e9fad203434ffaa6afe524e42a9fb6594edad61cb02b1ca60a68d1a7fe0c31ab libvirt.initd -807005a8669b7396c9af43ddb2534bb0f073f1e97a5c8b1d9eefc1949f3c2df8 uclibc-physmem.patch" +807005a8669b7396c9af43ddb2534bb0f073f1e97a5c8b1d9eefc1949f3c2df8 uclibc-physmem.patch +8dfa9dbe71ee21dc53e44bd7cc0127adde1bf3371d6b393657b386bb83f8139b musl-fix-includes.patch" sha512sums="834274b0249eb39439d21cd9b494fa2acbaee9e5337557b8d57977b483f3e5d00fd0a6743f8f4a02e826114c15d2468ab0c9385e4e4c9537abba18da3d8c5fa6 libvirt-1.2.0.tar.gz 9aba6ab73219a635c64a340ee8887356e644445c9128734cbce73f5d54778378da2f10a190365ad88a7db8bc95b1fb17f0c6ca41fc41bb786c09e1afe84d65dc libvirt.confd f48c97f93ef4509a86eda6200b3aae5b2c0c6263403bde933b770fd62240dca27bc439bd29b440ea6a47c8337f8b4511230ed915cb5ff54d9a1cf311863f6fa1 libvirt.initd -4c885e72dcb11f8523a267917315d4874812eee289fb00075334c1728d0da9bd0e5db6c52d6e3c39bd3fe66d5ccadf9e26ec9dcaa855397e211b9bd1173ac72d uclibc-physmem.patch" +4c885e72dcb11f8523a267917315d4874812eee289fb00075334c1728d0da9bd0e5db6c52d6e3c39bd3fe66d5ccadf9e26ec9dcaa855397e211b9bd1173ac72d uclibc-physmem.patch +b6142256bf2700b9e5335c60fe5628e4095a24689c31d54afcab46f46a06b9c0ae676f87f77a487377eafbec11fb7afa9b994aef48a10a39e82f47c45df008ba musl-fix-includes.patch" diff --git a/main/libvirt/musl-fix-includes.patch b/main/libvirt/musl-fix-includes.patch new file mode 100644 index 0000000000..61a2b209a9 --- /dev/null +++ b/main/libvirt/musl-fix-includes.patch @@ -0,0 +1,10 @@ +--- libvirt-1.2.0.orig/src/storage/storage_backend_fs.c ++++ libvirt-1.2.0/src/storage/storage_backend_fs.c +@@ -30,6 +30,7 @@ + #include <dirent.h> + #include <errno.h> + #include <fcntl.h> ++#include <paths.h> + #include <unistd.h> + #include <string.h> + |