aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-03-25 10:03:31 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-03-25 10:04:49 +0000
commitf8cb31bad4063410c251b5d2a4cbeef580d9e3ac (patch)
treeca01c6a73cc5af90641941ef018c0e46e9a71171 /main
parentd6030c90385b3ae512d508279c9f5a4cc5fa3cdb (diff)
downloadaports-f8cb31bad4063410c251b5d2a4cbeef580d9e3ac.tar.bz2
aports-f8cb31bad4063410c251b5d2a4cbeef580d9e3ac.tar.xz
main/qemu: build fix for uclibc
Diffstat (limited to 'main')
-rw-r--r--main/qemu/APKBUILD6
-rw-r--r--main/qemu/uclibc-xattr-create.patch16
2 files changed, 22 insertions, 0 deletions
diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD
index bcc816fe20..a80455fcac 100644
--- a/main/qemu/APKBUILD
+++ b/main/qemu/APKBUILD
@@ -76,6 +76,7 @@ source="http://wiki.qemu-project.org/download/qemu-$pkgver.tar.bz2
qemu-170-ffsll.patch
qemu-170-openpty.patch
qemu-170-sigset_t.patch
+ uclibc-xattr-create.patch
qemu-guest-agent.confd
qemu-guest-agent.initd
@@ -106,6 +107,8 @@ build() {
CFLAGS="$CFLAGS -D_GNU_SOURCE -Dflock64=flock"
CFLAGS="$CFLAGS -DF_EXLCK=4 -DF_SHLCK=8"
CFLAGS="$CFLAGS -D__SIGRTMIN=32 -D__SIGRTMAX=\(NSIG-1\)"
+ else
+ CFLAGS="$CFLAGS -DHAVE_FFSLL -DHAVE_FFSL"
fi
./configure \
--prefix=/usr \
@@ -241,6 +244,7 @@ a51a526312535019de143f2e6a54e3ce qemu-170-ffsl.patch
78f4d1b13ddee47887b6d59378e8e44e qemu-170-ffsll.patch
6589d3ba6975d245feefa0ad436eed76 qemu-170-openpty.patch
f5e8ee9c5cd1ebc37194f3c151f420a8 qemu-170-sigset_t.patch
+1d317f1b54eb88391e28a62eabb97660 uclibc-xattr-create.patch
1663bc6977f6886a58394155b1bf3676 qemu-guest-agent.confd
2035cd781ea810e94bda250c609d8d90 qemu-guest-agent.initd
66660f143235201249dc0648b39b86ee 80-kvm.rules"
@@ -250,6 +254,7 @@ af35304b165622a53f7557b59ffd8da5030f5fd444e669c862f9410131f3b987 0001-elfload-l
373ca5c783913645c6fc6c4c3b7740b0cc011aeed30bc8b848d5b26cf5d81070 qemu-170-ffsll.patch
6cffdccc3e270e7ab65701cc4e68692b577540f02763b14c66bf2225edb20f8b qemu-170-openpty.patch
fbc907e09c04110992a75bd4cc2f74fbc33e5b4a1cf0ebaa51c2a1dc4512ce5c qemu-170-sigset_t.patch
+fa8e174c57c58483f2798b249c4aad967a705498936be0d87c2944174c0b645e uclibc-xattr-create.patch
d84e53a94584f37f3bd1b21f44077b5de0d07094c6729f26ae20ab1f7b9cc298 qemu-guest-agent.confd
982fa8ba67c728405305e4cf5a36a41a780b3d1f388ebd6377e7964c271a1c92 qemu-guest-agent.initd
37f666f1cdb7d8a62171de69b531681dcb0fba74236729dac8b6c019232eba84 80-kvm.rules"
@@ -259,6 +264,7 @@ sha512sums="6ee52444b93fc2953e8080383cc0cdc618a826ddd5252bf5f6faf27d91699a414924
80168f5eadb518dbae8277cc2ff78cc494783e2180dfbf78d7b5c068c3efecd0bbb3d61dfb0079e365c632c1a80b82d6955de9718ff0b8e8613a52407bd5a2af qemu-170-ffsll.patch
b2cbb121c8ac85ee0aff835ecff59e2b4e886ddb9c5084286eaf735b5a3868043dad36e5e2289b6e6505bca4cfe971c9a35109a3638357d4b5b10168f921c984 qemu-170-openpty.patch
d867db00b0ac83c8dabd45c9ef0f07559f1f2045f3a4b7fd507a1ee276325e693f772b22511e2d5e1fce866de0ef4cd9da057119cfc39b905471a8995b36619e qemu-170-sigset_t.patch
+2e2ef2d5eb313f5bc89c11622278dfc67075a0eca8492e866cd8d9d4cf1171304c23822ed581b89ad36f951787cca858cb640cc8d7f3246f5f29861fc316c4e0 uclibc-xattr-create.patch
d90c034cae3f9097466854ed1a9f32ab4b02089fcdf7320e8f4da13b2b1ff65067233f48809911485e4431d7ec1a22448b934121bc9522a2dc489009e87e2b1f qemu-guest-agent.confd
761b4e2397569dae45ae3bb9e46e28746275297f629af9e9065525497fd26a48b65d8abcf4282727afd35309e338967acf6a1b14c3169577bdc16c1f42e618b3 qemu-guest-agent.initd
9b7a89b20fcf737832cb7b4d5dc7d8301dd88169cbe5339eda69fbb51c2e537d8cb9ec7cf37600899e734209e63410d50d0821bce97e401421db39c294d97be2 80-kvm.rules"
diff --git a/main/qemu/uclibc-xattr-create.patch b/main/qemu/uclibc-xattr-create.patch
new file mode 100644
index 0000000000..53cc1dfe23
--- /dev/null
+++ b/main/qemu/uclibc-xattr-create.patch
@@ -0,0 +1,16 @@
+--- ./include/qemu/xattr.h.orig
++++ ./include/qemu/xattr.h
+@@ -24,6 +24,13 @@
+ # include <attr/xattr.h>
+ #else
+ # define ENOATTR ENODATA
++/* workaround for uclibc */
++# ifdef XATTR_CREATE
++# undef XATTR_CREATE
++# endif
++# ifdef XATTR_REPLACE
++# undef XATTR_REPLACE
++# endif
+ # include <sys/xattr.h>
+ #endif
+