diff options
author | Mike Crowe <mac@mcrowe.com> | 2025-05-16 13:14:38 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2025-05-17 10:58:32 -0700 |
commit | 2d431c2d0b7e1171e81fb42ec6169756c337b2f4 (patch) | |
tree | 308c1b4b63f528095edeac8e0355a53afa2fd24d | |
parent | 110b9ebdee135d1f0fdf4a55d986bbb38244b2e7 (diff) | |
download | meta-openembedded-2d431c2d0b7e1171e81fb42ec6169756c337b2f4.tar.gz |
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>
-rw-r--r-- | meta-networking/recipes-connectivity/civetweb/civetweb_1.16.bb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meta-networking/recipes-connectivity/civetweb/civetweb_1.16.bb b/meta-networking/recipes-connectivity/civetweb/civetweb_1.16.bb index 4b08a44813..a7e81213c3 100644 --- a/meta-networking/recipes-connectivity/civetweb/civetweb_1.16.bb +++ b/meta-networking/recipes-connectivity/civetweb/civetweb_1.16.bb | |||
@@ -23,7 +23,6 @@ EXTRA_OECMAKE = " \ | |||
23 | -DCIVETWEB_ENABLE_LUA=OFF \ | 23 | -DCIVETWEB_ENABLE_LUA=OFF \ |
24 | -DCIVETWEB_ENABLE_ASAN=OFF \ | 24 | -DCIVETWEB_ENABLE_ASAN=OFF \ |
25 | -DCIVETWEB_BUILD_TESTING=OFF \ | 25 | -DCIVETWEB_BUILD_TESTING=OFF \ |
26 | -DCIVETWEB_SSL_OPENSSL_API_3_0=ON \ | ||
27 | " | 26 | " |
28 | 27 | ||
29 | # Building with ninja fails on missing third_party/lib/libcheck.a (which | 28 | # 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," | |||
37 | PACKAGECONFIG[debug] = "-DCIVETWEB_ENABLE_MEMORY_DEBUGGING=ON,-DCIVETWEB_ENABLE_MEMORY_DEBUGGING=OFF," | 36 | PACKAGECONFIG[debug] = "-DCIVETWEB_ENABLE_MEMORY_DEBUGGING=ON,-DCIVETWEB_ENABLE_MEMORY_DEBUGGING=OFF," |
38 | PACKAGECONFIG[ipv6] = "-DCIVETWEB_ENABLE_IPV6=ON,-DCIVETWEB_ENABLE_IPV6=OFF," | 37 | PACKAGECONFIG[ipv6] = "-DCIVETWEB_ENABLE_IPV6=ON,-DCIVETWEB_ENABLE_IPV6=OFF," |
39 | PACKAGECONFIG[server] = "-DCIVETWEB_ENABLE_SERVER_EXECUTABLE=ON -DCIVETWEB_INSTALL_EXECUTABLE=ON,-DCIVETWEB_ENABLE_SERVER_EXECUTABLE=OFF -DCIVETWEB_INSTALL_EXECUTABLE=OFF," | 38 | PACKAGECONFIG[server] = "-DCIVETWEB_ENABLE_SERVER_EXECUTABLE=ON -DCIVETWEB_INSTALL_EXECUTABLE=ON,-DCIVETWEB_ENABLE_SERVER_EXECUTABLE=OFF -DCIVETWEB_INSTALL_EXECUTABLE=OFF," |
40 | 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%)," | 39 | 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%)," |
41 | PACKAGECONFIG[websockets] = "-DCIVETWEB_ENABLE_WEBSOCKETS=ON,-DCIVETWEB_ENABLE_WEBSOCKETS=OFF," | 40 | PACKAGECONFIG[websockets] = "-DCIVETWEB_ENABLE_WEBSOCKETS=ON,-DCIVETWEB_ENABLE_WEBSOCKETS=OFF," |
42 | 41 | ||
43 | do_install:append() { | 42 | do_install:append() { |