From fc60d791b82b306ae0ba154990fa94ca91ac84ee Mon Sep 17 00:00:00 2001 From: alperak Date: Sun, 12 Nov 2023 23:04:51 +0300 Subject: civetweb: upgrade 1.12 -> 1.16 ========================= - Added "-DCIVETWEB_SSL_OPENSSL_API_3_0=ON" because of following error: civetweb.c:1561:2: error: #error "Please define OPENSSL_API_#_# or USE_MBEDTLS" You may also want to check out the available CMake options here: https://github.com/civetweb/civetweb/blob/d7ba35bbb649209c66e582d5a0244ba988a15159/CMakeLists.txt ========================= Changelog: https://github.com/civetweb/civetweb/blob/d7ba35bbb649209c66e582d5a0244ba988a15159/RELEASE_NOTES.md Signed-off-by: alperak Signed-off-by: Khem Raj --- .../recipes-connectivity/civetweb/civetweb_1.16.bb | 43 ++++++++++++++++++++++ .../recipes-connectivity/civetweb/civetweb_git.bb | 42 --------------------- 2 files changed, 43 insertions(+), 42 deletions(-) create mode 100644 meta-networking/recipes-connectivity/civetweb/civetweb_1.16.bb delete mode 100644 meta-networking/recipes-connectivity/civetweb/civetweb_git.bb diff --git a/meta-networking/recipes-connectivity/civetweb/civetweb_1.16.bb b/meta-networking/recipes-connectivity/civetweb/civetweb_1.16.bb new file mode 100644 index 0000000000..0a654a10f1 --- /dev/null +++ b/meta-networking/recipes-connectivity/civetweb/civetweb_1.16.bb @@ -0,0 +1,43 @@ +SUMMARY = "Civetweb embedded web server" +HOMEPAGE = "https://github.com/civetweb/civetweb" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=ce6ce6eb1b2fd59ee6bab219470442a3" + +SRCREV = "d7ba35bbb649209c66e582d5a0244ba988a15159" + +SRC_URI = "git://github.com/civetweb/civetweb.git;branch=master;protocol=https \ + file://0001-Unittest-Link-librt-and-libm-using-l-option.patch \ + " + +S = "${WORKDIR}/git" + +# civetweb supports building with make or cmake (although cmake lacks few features) +inherit cmake + +# Disable Lua and Duktape because they do not compile from CMake (as of v1.8, v1.9 and v1.10). +# Disable ASAN as it is included only in Debug build. +EXTRA_OECMAKE = " \ + -DBUILD_SHARED_LIBS=ON \ + -DCIVETWEB_ENABLE_DUKTAPE=OFF \ + -DCIVETWEB_ENABLE_LUA=OFF \ + -DCIVETWEB_ENABLE_ASAN=OFF \ + -DCIVETWEB_BUILD_TESTING=OFF \ + -DCIVETWEB_SSL_OPENSSL_API_3_0=ON \ +" + +# Building with ninja fails on missing third_party/lib/libcheck.a (which +# should come from external CMake project) +OECMAKE_GENERATOR = "Unix Makefiles" + +PACKAGECONFIG ??= "caching ipv6 server ssl websockets" +PACKAGECONFIG[caching] = "-DCIVETWEB_DISABLE_CACHING=OFF,-DCIVETWEB_DISABLE_CACHING=ON," +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_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," + +BBCLASSEXTEND = "native" diff --git a/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb b/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb deleted file mode 100644 index e9c2056180..0000000000 --- a/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "Civetweb embedded web server" -HOMEPAGE = "https://github.com/civetweb/civetweb" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=50bd1d7f135b50d7e218996ba28d0d88" - -SRCREV = "4b440a339979852d5a51fb11a822952712231c23" -PV = "1.12+git${SRCPV}" -SRC_URI = "git://github.com/civetweb/civetweb.git;branch=master;protocol=https \ - file://0001-Unittest-Link-librt-and-libm-using-l-option.patch \ - " - -S = "${WORKDIR}/git" - -# civetweb supports building with make or cmake (although cmake lacks few features) -inherit cmake - -# Disable Lua and Duktape because they do not compile from CMake (as of v1.8, v1.9 and v1.10). -# Disable ASAN as it is included only in Debug build. -EXTRA_OECMAKE = " \ - -DBUILD_SHARED_LIBS=ON \ - -DCIVETWEB_ENABLE_DUKTAPE=OFF \ - -DCIVETWEB_ENABLE_LUA=OFF \ - -DCIVETWEB_ENABLE_ASAN=OFF \ - -DCIVETWEB_BUILD_TESTING=OFF \ -" - -# Building with ninja fails on missing third_party/lib/libcheck.a (which -# should come from external CMake project) -OECMAKE_GENERATOR = "Unix Makefiles" - -PACKAGECONFIG ??= "caching ipv6 server ssl websockets" -PACKAGECONFIG[caching] = "-DCIVETWEB_DISABLE_CACHING=OFF,-DCIVETWEB_DISABLE_CACHING=ON," -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_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," - -BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf