Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

openvswitch: fix build with musl and GCC 5

Browse source 
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
This commit is contained in:
Alexandru Ardelean 2015-12-13 21:45:20 +02:00
parent 315ef6bf42
commit 9afb25cc5a
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/openvswitch/Makefile
View file

@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openvswitch PKG_NAME:=openvswitch
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_VERSION:=2.4.0 PKG_VERSION:=2.4.0
PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0

26
net/openvswitch/patches/0004-musl-compatibility.patch
View file

@ -1,8 +1,8 @@
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 8d47eb9..69eeed8 100644 index e6a23a6..8a7c6d6 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -117,7 +117,6 @@ OVS_CHECK_XENSERVER_VERSION @@ -118,7 +118,6 @@ OVS_CHECK_XENSERVER_VERSION
OVS_CHECK_GROFF OVS_CHECK_GROFF
OVS_CHECK_GNU_MAKE OVS_CHECK_GNU_MAKE
OVS_CHECK_TLS OVS_CHECK_TLS
@ -11,7 +11,7 @@ index 8d47eb9..69eeed8 100644
OVS_CHECK_ATOMIC_ALWAYS_LOCK_FREE(1) OVS_CHECK_ATOMIC_ALWAYS_LOCK_FREE(1)
OVS_CHECK_ATOMIC_ALWAYS_LOCK_FREE(2) OVS_CHECK_ATOMIC_ALWAYS_LOCK_FREE(2)
diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c
index 9b2e74f..70126bb 100644 index 712cb5a..e840f10 100644
--- a/lib/netdev-linux.c --- a/lib/netdev-linux.c
+++ b/lib/netdev-linux.c +++ b/lib/netdev-linux.c
@@ -40,7 +40,9 @@ @@ -40,7 +40,9 @@
@ -25,15 +25,15 @@ index 9b2e74f..70126bb 100644
#include <netinet/in.h> #include <netinet/in.h>
#include <poll.h> #include <poll.h>
diff --git a/lib/ovs-atomic.h b/lib/ovs-atomic.h diff --git a/lib/ovs-atomic.h b/lib/ovs-atomic.h
index 9ead907..86d3341 100644 index 9ead907..0a131d7 100644
--- a/lib/ovs-atomic.h --- a/lib/ovs-atomic.h
+++ b/lib/ovs-atomic.h +++ b/lib/ovs-atomic.h
@@ -325,8 +325,6 @@ @@ -318,7 +318,7 @@
#include "ovs-atomic-clang.h" #include "util.h"
#elif HAVE_STDATOMIC_H
#include "ovs-atomic-c11.h" #define IN_OVS_ATOMIC_H
- #elif __GNUC__ >= 4 && __GNUC_MINOR__ >= 7 - #if __CHECKER__
- #include "ovs-atomic-gcc4.7+.h" + #if 1
#elif __GNUC__ && defined(__x86_64__) /* sparse doesn't understand some GCC extensions we use. */
#include "ovs-atomic-x86_64.h" #include "ovs-atomic-pthreads.h"
#elif __GNUC__ && defined(__i386__) #elif __has_extension(c_atomic)