Skip to contentSkip to conversation

civetweb: Add new recipe for v1.10 version

PATCH New Krzysztof Kozlowski 1 participant 1 message Apr 18, 2018

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 civetweb: Add new recipe for v1.10 version

Add recipe for CivetWeb: easy to use, powerful, C/C++ embeddable web server with optional CGI, SSL and Lua support, under MIT license.

CivetWeb provides C and C++ libraries and a standalone server binary.

---

Changes since v1:
1. Use SRCREC as suggested by Khem Raj.
2. Drop nativesdk class.
3. Fix native build with patch.
4. Explicitly disable SSL (does not build at v1.10).
5. Disable ASAN (not applicable for native builds).

---
 ...ssing-librt-and-libm-during-native-compil.patch | 42 ++++++++++++++++++++
 .../recipes-connectivity/civetweb/civetweb_1.10.bb | 45 ++++++++++++++++++++++
 2 files changed, 87 insertions(+)
 create mode 100644 meta-networking/recipes-connectivity/civetweb/civetweb/0001-Test-Fix-missing-librt-and-libm-during-native-compil.patch
 create mode 100644 meta-networking/recipes-connectivity/civetweb/civetweb_1.10.bb
meta-networking/recipes-connectivity/civetweb/civetweb/0001-Test-Fix-missing-librt-and-libm-during-native-compil.patch new file +42 -0
new file mode 100644
index 000000000000..23479561f85f
@@ -0,0 +1,42 @@
+From cd93e2c538cecb3192fd24c0fbd6e834d0c47eec Mon Sep 17 00:00:00 2001
+From: Krzysztof Kozlowski <[email protected]>
+Date: Wed, 18 Apr 2018 14:11:52 +0200
+Subject: [PATCH] Test: Fix missing librt and libm during native compilation
+
+civetweb looks for librt and libm in weird places and for native build
+this fails:
+
+    | ../third_party/lib/libcheck.a(check.c.o): In function `tcase_create':
+    | build/tmp/work/x86_64-linux/civetweb-native/1.10-r0/build/third_party/src/check-unit-test-framework/src/check.c:145: undefined reference to `floor'
+    | build/tmp/work/x86_64-linux/civetweb-native/1.10-r0/build/third_party/src/check-unit-test-framework/src/check.c:148: undefined reference to `floor'
+
+These are needed dependencies so try regular system linkage in such
+case.
+
+Signed-off-by: Krzysztof Kozlowski <[email protected]>
+---
+ test/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index f34b2e0e4ce4..05d25702178c 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -60,10 +60,14 @@ endif()
+ find_package(LibM)
+ if (LIBM_FOUND)
+   set(CHECK_LIBRARIES "${CHECK_LIBRARIES};LIBM::LIBM")
++else()
++  set(CHECK_LIBRARIES "${CHECK_LIBRARIES};-lm")
+ endif()
+ find_package(LibRt)
+ if (LIBRT_FOUND)
+   set(CHECK_LIBRARIES "${CHECK_LIBRARIES};LIBRT::LIBRT")
++else()
++  set(CHECK_LIBRARIES "${CHECK_LIBRARIES};-lrt")
+ endif()
+ 
+ # Build the C unit tests
+-- 
+2.7.4
+
meta-networking/recipes-connectivity/civetweb/civetweb_1.10.bb new file +45 -0

45 lines not on this page · raw message

Signature · 1 line
2.7.4