mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
civetweb: Fix build with ssl disabled
Move enabling of openssl 3.0 API from EXTRA_OECMAKE to PACKAGECONFIG[ssl] so that this package can still be configured successfully without ssl in PACKAGECONFIG. Signed-off-by: Mike Crowe <mac@mcrowe.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -23,7 +23,6 @@ EXTRA_OECMAKE = " \
|
||||
-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
|
||||
@@ -37,7 +36,7 @@ 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[ssl] = "-DCIVETWEB_ENABLE_SSL=ON -DCIVETWEB_SSL_OPENSSL_API_1_1=OFF -DCIVETWEB_SSL_OPENSSL_API_3_0=ON -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=OFF,-DCIVETWEB_ENABLE_SSL=OFF,openssl (=1.0.2%),"
|
||||
PACKAGECONFIG[websockets] = "-DCIVETWEB_ENABLE_WEBSOCKETS=ON,-DCIVETWEB_ENABLE_WEBSOCKETS=OFF,"
|
||||
|
||||
do_install:append() {
|
||||
|
||||
Reference in New Issue
Block a user