From: Florian Schmidt <florian.schmidt@neclab.eu>
Date: Wed, 5 Jun 2019 12:43:28 +0000 (+0200)
Subject: Initial public release: patches to make click build with unikraft
X-Git-Tag: RELEASE-0.4~6
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2f6bdabbdc777b22b83193348fb2af982dc673ce;p=unikraft%2Flibs%2Fclick.git

Initial public release: patches to make click build with unikraft

Signed-off-by: Florian Schmidt <florian.schmidt@neclab.eu>
Reviewed-by: Felipe Huici <felipe.huici@neclab.eu>
---

diff --git a/patches/0001-userlevel-new-delete-cxa.patch b/patches/0001-userlevel-new-delete-cxa.patch
new file mode 100644
index 0000000..af9cdf4
--- /dev/null
+++ b/patches/0001-userlevel-new-delete-cxa.patch
@@ -0,0 +1,20 @@
+--- a/lib/glue.cc.orig	2018-02-14 11:11:38.364024729 +0100
++++ b/lib/glue.cc	2018-02-14 11:44:31.880908099 +0100
+@@ -179,7 +179,7 @@
+ size_t click_dmalloc_maxmem = 0;
+ #endif
+ 
+-#if CLICK_LINUXMODULE || CLICK_BSDMODULE || CLICK_MINIOS
++#if CLICK_LINUXMODULE || CLICK_BSDMODULE || CLICK_MINIOS || CLICK_USERLEVEL
+ 
+ # if CLICK_LINUXMODULE
+ struct task_struct *clickfs_task;
+@@ -721,7 +721,7 @@
+ 
+ // OTHER
+ 
+-#if CLICK_LINUXMODULE || CLICK_BSDMODULE || CLICK_MINIOS
++#if CLICK_LINUXMODULE || CLICK_BSDMODULE || CLICK_MINIOS || CLICK_USERLEVEL
+ 
+ #if CLICK_BSDMODULE
+ 
diff --git a/patches/0002-Make-sure-POLLIN-POLLOUT-are-not-defined.patch b/patches/0002-Make-sure-POLLIN-POLLOUT-are-not-defined.patch
new file mode 100644
index 0000000..e11af50
--- /dev/null
+++ b/patches/0002-Make-sure-POLLIN-POLLOUT-are-not-defined.patch
@@ -0,0 +1,35 @@
+From b9f04f6ddc388f6a50a82e8830e42badbfc4717b Mon Sep 17 00:00:00 2001
+From: Florian Schmidt <florian.schmidt@neclab.eu>
+Date: Wed, 17 Apr 2019 11:03:55 +0200
+Subject: [PATCH] Make sure POLLIN/POLLOUT are not defined
+
+We use select instead of poll, because lwip provides a select via its
+socket API. However, that one also defines a couple of POLL* values,
+which lead to a compiler error here because you end up with a line that
+says "enum { 0x1 = Element::SELECT_READ" etc.
+
+Signed-off-by: Florian Schmidt <florian.schmidt@neclab.eu>
+---
+ lib/selectset.cc | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/lib/selectset.cc b/lib/selectset.cc
+index ac5ccae49..641b63f90 100644
+--- a/lib/selectset.cc
++++ b/lib/selectset.cc
+@@ -38,6 +38,12 @@ CLICK_DECLS
+ namespace {
+ enum { SELECT_READ = Element::SELECT_READ, SELECT_WRITE = Element::SELECT_WRITE };
+ #if !HAVE_ALLOW_POLL
++#ifdef POLLIN
++#undef POLLIN
++#endif
++#ifdef POLLOUT
++#undef POLLOUT
++#endif
+ enum { POLLIN = Element::SELECT_READ, POLLOUT = Element::SELECT_WRITE };
+ #endif
+ }
+-- 
+2.21.0
+