From 88fe192f466d20383447ac1cdb94ae2b2fc4f6da Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 12 Mar 2014 19:03:21 +0000
Subject: testing/openvswitch: build fix for musl

---
 testing/openvswitch/APKBUILD             | 22 ++++++++++++++++------
 testing/openvswitch/musl-if_packet.patch | 14 ++++++++++++++
 2 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 testing/openvswitch/musl-if_packet.patch

(limited to 'testing')

diff --git a/testing/openvswitch/APKBUILD b/testing/openvswitch/APKBUILD
index 83547809c..1a439db48 100644
--- a/testing/openvswitch/APKBUILD
+++ b/testing/openvswitch/APKBUILD
@@ -18,15 +18,19 @@ source="http://openvswitch.org/releases/$pkgname-$pkgver.tar.gz
 	ovsdb-server.confd
 	ovs-vswitchd.initd
 	ovs-vswitchd.confd
-	ovs-modules.initd"
+	ovs-modules.initd
+	remove-test-atomic-8byte.patch
+	musl-if_packet.patch
+	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	local i
         cd "$_builddir"
-	#patch not needed after v2.0.1 https://www.mail-archive.com/dev@openvswitch.org/msg25840.html
-	patch -p1 -i ../../remove-test-atomic-8byte.patch || return 1
+
+	# remove-test-atomic-8byte.patch not needed after v2.0.1
+	# https://www.mail-archive.com/dev@openvswitch.org/msg25840.html
 
         for i in $source; do
                 case $i in
@@ -73,16 +77,22 @@ md5sums="a2122b1c293c8d05dc0c673d42a9da08  openvswitch-2.0.1.tar.gz
 f10a8ac784654bec359bda52779f16fe  ovsdb-server.confd
 003297c9ec93877508812332101c2bf5  ovs-vswitchd.initd
 2d1e0111ea62779f49e14d62678294b2  ovs-vswitchd.confd
-ae128e5c349710c0fb3849b2d3b3aa40  ovs-modules.initd"
+ae128e5c349710c0fb3849b2d3b3aa40  ovs-modules.initd
+a839a2350c9413649c8e7882c7a7da48  remove-test-atomic-8byte.patch
+6e17032bd6e7caf6e6e844b5a84d7080  musl-if_packet.patch"
 sha256sums="014907bcf2f98228dfa4472ea1547871d24b8fb8192dcfff3ead1af93c433a67  openvswitch-2.0.1.tar.gz
 b58a4bdab9ca035a9271067edadb19598985c55820f020d8aefe71b516a3e7f6  ovsdb-server.initd
 d0d8a6a7256f4cc47ab1b9f9f7657202388133bcfff3668e7c1d4adbcc572261  ovsdb-server.confd
 591d8c10080ba2fa2ddf5bf8da281d931421c95ff728f56fbaa10be7c3d8431c  ovs-vswitchd.initd
 cc189d5ca24708ff775a4de312df3f611c65714724b8901ec6527c9e3f22e14a  ovs-vswitchd.confd
-94f4dba5e2ddedb9c91911b02dbfc41a5114e8a5066a8db3ef4444ebb5400173  ovs-modules.initd"
+94f4dba5e2ddedb9c91911b02dbfc41a5114e8a5066a8db3ef4444ebb5400173  ovs-modules.initd
+99e43d8ac26692b87129e9b911f66b3981182c616fdd89295b7d7932b2118ada  remove-test-atomic-8byte.patch
+d0e9e3e30b2943b10e7efa59c41c3bf8d5b599d55fc99198146bf4761df4d8ae  musl-if_packet.patch"
 sha512sums="4207cac887c9e2dad234d1e2b70d5309e51b8d10dbe994f125ff9e967935f3674574651c9fb297cf59dbc355830f2947cd98e4f5d28aaf495b9b950a9f603eeb  openvswitch-2.0.1.tar.gz
 6d660c986666b3f3b052d5ff6a8555c8bf5234fee8c4740d70974b1ac00ee2a0711e931494556290e18fce820ce8f2d4a5f25e40e9c863da9b639c18c0515763  ovsdb-server.initd
 b1588d076bbfc7ef2dd46fce8e46186f40cbbc4667697f7ac13ddc68e34568fdab315fde47838de7f6d32916853190336cfe3735f672ad7cb624ae14dbff55a5  ovsdb-server.confd
 3d493047a6729b7e0742438de828a2530acbcdac9c1c410786bf1eefb5e9f09850fb479f45245f550d1077146d4545fb91a845ae79f673b6c1c2902220920e33  ovs-vswitchd.initd
 346aea099f51707d2b4fc9fdc8c1502582723fb4e00c4d5d1624b0378c94dfb76674fa95e2af894f36169df52109dbe441ee6a45aa744584d9e4c74d15a46c1d  ovs-vswitchd.confd
-e1f88ff11cd1d5a4025626acad49411e8a2d5d7caa20d0a63ef0422a9b1bb55b070843327d8bb209e1e915d2a3f1c3bcae911acf40e0a419bc6cce6250239232  ovs-modules.initd"
+e1f88ff11cd1d5a4025626acad49411e8a2d5d7caa20d0a63ef0422a9b1bb55b070843327d8bb209e1e915d2a3f1c3bcae911acf40e0a419bc6cce6250239232  ovs-modules.initd
+6598ccabe27922d68e415e16ad5e3d0b9abd26aeb6dd1793ad91f9cf32dc3e8f7a7c36cc607512b05b873afb7d87cb220f62f85b587917cf91992295991a0465  remove-test-atomic-8byte.patch
+1ebfb2629081cc0b34383e6c2f163f3c1d43da3a399b8ba8745871b77029d3b8fc21a287ff859a6a9cca2cb4885715458d4e4086cb6c17765ff7c898d4004850  musl-if_packet.patch"
diff --git a/testing/openvswitch/musl-if_packet.patch b/testing/openvswitch/musl-if_packet.patch
new file mode 100644
index 000000000..ff9d76119
--- /dev/null
+++ b/testing/openvswitch/musl-if_packet.patch
@@ -0,0 +1,14 @@
+--- ./lib/netdev-linux.c.orig
++++ ./lib/netdev-linux.c
+@@ -37,10 +37,9 @@
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+-#include <netpacket/packet.h>
+ #include <net/if.h>
+ #include <net/if_arp.h>
+-#include <net/if_packet.h>
++#include <linux/if_packet.h>
+ #include <net/route.h>
+ #include <netinet/in.h>
+ #include <poll.h>
-- 
cgit v1.2.3