CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-04 16:10:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

civetweb: Bump to v1.11

Browse Source 
Drop upstream accepted patch.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Krzysztof Kozlowski 2019-01-25 15:46:47 +01:00 committed by Khem Raj
parent 3893910f9a
commit f394ef48f7
2 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
meta-networking/recipes-connectivity/civetweb/civetweb/0001-undefine-macro-before-redefining.patch
View File

@ -1,26 +0,0 @@
From 59f65235a7a690f50d1686e9977908c053697d8c Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 28 Aug 2018 22:59:13 -0700
Subject: [PATCH] undefine macro before redefining
Fixes
src/main.c:89:9: error: 'printf' macro redefined [-Werror,-Wmacro-redefined]
Upstream-Stats: Submitted [https://github.com/civetweb/civetweb/pull/649]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/main.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main.c b/src/main.c
index bbcb0aec..01191a3c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -86,6 +86,7 @@
#include "civetweb.h"
+#undef printf
#define printf \
DO_NOT_USE_THIS_FUNCTION__USE_fprintf /* Required for unit testing */

7
meta-networking/recipes-connectivity/civetweb/civetweb_git.bb
View File

@ -4,11 +4,10 @@ HOMEPAGE = "https://github.com/civetweb/civetweb"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6f28fdcba0dda735eed62bac6a397562"
SRCREV = "19f31ba8dd8443e86c7028a4b4c37f4b299aa68c"
PV = "1.10+git${SRCPV}"
SRCREV = "ce8f6d38a60eb16c996afee1e5340f76ef4d0923"
PV = "1.11+git${SRCPV}"
SRC_URI = "git://github.com/civetweb/civetweb.git \
file://0001-Unittest-Link-librt-and-libm-using-l-option.patch \
file://0001-undefine-macro-before-redefining.patch \
"
S = "${WORKDIR}/git"
@ -36,7 +35,7 @@ PACKAGECONFIG[cgi] = "-DCIVETWEB_DISABLE_CGI=OFF,-DCIVETWEB_DISABLE_CGI=ON,"
PACKAGECONFIG[cpp] = "-DCIVETWEB_ENABLE_CXX=ON,-DCIVETWEB_ENABLE_CXX=OFF,"
PACKAGECONFIG[debug] = "-DCIVETWEB_ENABLE_MEMORY_DEBUGGING=ON,-DCIVETWEB_ENABLE_MEMORY_DEBUGGING=OFF,"
PACKAGECONFIG[ipv6] = "-DCIVETWEB_ENABLE_IPV6=ON,-DCIVETWEB_ENABLE_IPV6=OFF,"
PACKAGECONFIG[server] = "-DCIVETWEB_INSTALL_EXECUTABLE=ON,-DCIVETWEB_INSTALL_EXECUTABLE=OFF,"
PACKAGECONFIG[server] = "-DCIVETWEB_ENABLE_SERVER_EXECUTABLE=ON -DCIVETWEB_INSTALL_EXECUTABLE=ON,-DCIVETWEB_ENABLE_SERVER_EXECUTABLE=OFF -DCIVETWEB_INSTALL_EXECUTABLE=OFF,"
PACKAGECONFIG[ssl] = "-DCIVETWEB_ENABLE_SSL=ON -DCIVETWEB_SSL_OPENSSL_API_1_1=OFF -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=OFF,-DCIVETWEB_ENABLE_SSL=OFF,openssl (=1.0.2%),"
PACKAGECONFIG[websockets] = "-DCIVETWEB_ENABLE_WEBSOCKETS=ON,-DCIVETWEB_ENABLE_WEBSOCKETS=OFF,"