diff options
author | Krzysztof Kozlowski <krzk@kernel.org> | 2018-05-25 10:24:32 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-05-29 12:56:19 -0700 |
commit | ba53d1341bcc193cdcf4f6f74699693f27aa19b7 (patch) | |
tree | a7caa1b8c2518cbff283b674ef990943109e3064 /meta-networking/recipes-connectivity/civetweb/civetweb | |
parent | cd58494ee7103ddfd9f75b8ed4d91f7107fa97a6 (diff) | |
download | meta-openembedded-contrib-ba53d1341bcc193cdcf4f6f74699693f27aa19b7.tar.gz |
civetweb: Add new recipe with git-based 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.
Choose specific post-v1.10 git revision b8148afe8fa4 which has a fixed
SSL support (depending on OpenSSL v1.0.2).
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-connectivity/civetweb/civetweb')
-rw-r--r-- | meta-networking/recipes-connectivity/civetweb/civetweb/0001-Test-Fix-missing-librt-and-libm-during-native-compil.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/meta-networking/recipes-connectivity/civetweb/civetweb/0001-Test-Fix-missing-librt-and-libm-during-native-compil.patch b/meta-networking/recipes-connectivity/civetweb/civetweb/0001-Test-Fix-missing-librt-and-libm-during-native-compil.patch new file mode 100644 index 0000000000..401cf39ad8 --- /dev/null +++ b/meta-networking/recipes-connectivity/civetweb/civetweb/0001-Test-Fix-missing-librt-and-libm-during-native-compil.patch @@ -0,0 +1,42 @@ +From cd93e2c538cecb3192fd24c0fbd6e834d0c47eec Mon Sep 17 00:00:00 2001 +From: Krzysztof Kozlowski <krzk@kernel.org> +Date: Wed, 18 Apr 2018 14:11:52 +0200 +Subject: [PATCH] Unittest: 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 <krzk@kernel.org> +--- + unittest/CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt +index f34b2e0e4ce4..05d25702178c 100644 +--- a/unittest/CMakeLists.txt ++++ b/unittest/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 + |