diff options
Diffstat (limited to 'external/meta-openembedded/meta-networking/recipes-connectivity/civetweb')
2 files changed, 4 insertions, 31 deletions
diff --git a/external/meta-openembedded/meta-networking/recipes-connectivity/civetweb/civetweb/0001-undefine-macro-before-redefining.patch b/external/meta-openembedded/meta-networking/recipes-connectivity/civetweb/civetweb/0001-undefine-macro-before-redefining.patch deleted file mode 100644 index 86533021..00000000 --- a/external/meta-openembedded/meta-networking/recipes-connectivity/civetweb/civetweb/0001-undefine-macro-before-redefining.patch +++ /dev/null @@ -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 */ - diff --git a/external/meta-openembedded/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb b/external/meta-openembedded/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb index d681f7f3..2820f9fa 100644 --- a/external/meta-openembedded/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb +++ b/external/meta-openembedded/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb @@ -2,13 +2,12 @@ SUMMARY = "Civetweb embedded web server" HOMEPAGE = "https://github.com/civetweb/civetweb" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6f28fdcba0dda735eed62bac6a397562" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=50bd1d7f135b50d7e218996ba28d0d88" -SRCREV = "19f31ba8dd8443e86c7028a4b4c37f4b299aa68c" -PV = "1.10+git${SRCPV}" +SRCREV = "4b440a339979852d5a51fb11a822952712231c23" +PV = "1.12+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," |