summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-04-18 18:14:46 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2011-04-18 18:15:24 +0200
commit81c1e08f413e033a5fe9f3055bdb5e6eb0e7a7e2 (patch)
treec0aa14030f433aaad02395a838236eefd4c0d503 /main
parentec5ae944f50a0f6f357d2185bbaec206d6632e57 (diff)
downloadaports-81c1e08f413e033a5fe9f3055bdb5e6eb0e7a7e2.tar.bz2
aports-81c1e08f413e033a5fe9f3055bdb5e6eb0e7a7e2.tar.xz
main/xen: build fix
more hacks for blktap
Diffstat (limited to 'main')
-rw-r--r--main/xen/APKBUILD4
-rw-r--r--main/xen/blktap-write.patch24
2 files changed, 28 insertions, 0 deletions
diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD
index d6657db7f..ca734eb16 100644
--- a/main/xen/APKBUILD
+++ b/main/xen/APKBUILD
@@ -18,6 +18,7 @@ source="http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.g
xen-disable-werror.patch
xen-dont-use-lib64.patch
xen-sed-is-broken-hack.patch
+ blktap-write.patch
xend.initd
xendomains.initd"
arch="x86_64"
@@ -35,6 +36,8 @@ prepare() {
;;
esac
done
+ # remove all -Werror
+ find -name '*.mk' -o -name 'Make*' | xargs sed 's/-Werror//g'
}
build() {
@@ -75,5 +78,6 @@ a569f16a7e3c832ba3fab6154f657244 xen-disable-firmware.patch
949d0d3bc1e8f300a849279b60760c6a xen-disable-werror.patch
b6599060e22b61dabee0fe460b4a0c9d xen-dont-use-lib64.patch
0cec6a97de9e4bc178f3e71190495cc3 xen-sed-is-broken-hack.patch
+56af00443c8d40944082e26304452a5e blktap-write.patch
1d81b04f8c8b919879a73f0e3d2fe80f xend.initd
a2b5234483f1b5892d22e9315d9c307f xendomains.initd"
diff --git a/main/xen/blktap-write.patch b/main/xen/blktap-write.patch
new file mode 100644
index 000000000..4b589daec
--- /dev/null
+++ b/main/xen/blktap-write.patch
@@ -0,0 +1,24 @@
+--- ./tools/blktap2/include/blktaplib.h.orig
++++ ./tools/blktap2/include/blktaplib.h
+@@ -198,7 +198,9 @@
+ } msg_lock_t;
+
+ #define READ 0
++#ifndef WRITE
+ #define WRITE 1
++#endif
+
+ /*Control Messages between manager and tapdev*/
+ #define CTLMSG_PARAMS 1
+--- ./tools/blktap/lib/blktaplib.h.orig
++++ ./tools/blktap/lib/blktaplib.h
+@@ -196,7 +196,9 @@
+ } msg_pid_t;
+
+ #define READ 0
++#ifndef WRITE
+ #define WRITE 1
++#endif
+
+ /*Control Messages between manager and tapdev*/
+ #define CTLMSG_PARAMS 1