Skip to content

Fix Fedora OTEL and WAMR builds #13423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bneradt wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −6
Open

Fix Fedora OTEL and WAMR builds #13423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,10 @@ else()
endif()
check_openssl_is_quictls(SSLLIB_IS_QUICTLS "${OPENSSL_INCLUDE_DIR}")

if(OPENSSL_VERSION VERSION_GREATER_EQUAL "3.0.0")
if(NOT SSLLIB_IS_BORINGSSL
AND NOT SSLLIB_IS_AWSLC
AND OPENSSL_VERSION VERSION_GREATER_EQUAL "3.0.0"
)
set(SSLLIB_IS_OPENSSL3 TRUE)
add_compile_definitions(OPENSSL_API_COMPAT=10002 OPENSSL_IS_OPENSSL3)
endif()
Expand Down
12 changes: 8 additions & 4 deletions CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,12 @@
"inherits": ["ci"],
"cacheVariables": {
"ENABLE_PROBES": "ON",
"OPENSSL_ROOT_DIR": "/opt/openssl-quic",
"OPENSSL_ROOT_DIR": "/usr",
"opentelemetry_ROOT": "/opt",
"CURL_ROOT": "/opt",
"CURL_ROOT": "/usr",
"wamr_ROOT": "/opt",
"ENABLE_OTEL_TRACER": "ON",
"ENABLE_WASM_WAMR": "ON",
Comment thread
bneradt marked this conversation as resolved.
"ENABLE_CRIPTS": "ON"
}
},
Expand All @@ -210,15 +212,17 @@
"OPENSSL_ROOT_DIR": "/opt/h3-tools-boringssl/boringssl",
"quiche_ROOT": "/opt/h3-tools-boringssl/quiche",
"opentelemetry_ROOT": "/opt",
"CURL_ROOT": "/opt",
"CURL_ROOT": "/opt/h3-tools-boringssl",
"wamr_ROOT": "/opt",
"ENABLE_OTEL_TRACER": "ON",
"ENABLE_WASM_WAMR": "ON",
"CMAKE_INSTALL_PREFIX": "/tmp/ats-quiche",
"ENABLE_QUICHE": "ON"
}
},
{
"name": "ci-fedora-autest",
"displayName": "CI Fedora Quiche Autest",
"displayName": "CI Fedora Autest",
"description": "CI Pipeline config for Fedora Linux (autest build)",
"inherits": ["ci-fedora", "autest"]
},
Expand Down
2 changes: 1 addition & 1 deletion plugins/experimental/wasm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ if(wasmedge_FOUND)
list(APPEND WASM_RUNTIME wasmedge::wasmedge)
endif()

target_link_libraries(wasm PRIVATE ${WASM_RUNTIME})
target_link_libraries(wasm PRIVATE OpenSSL::SSL ${WASM_RUNTIME})

if(wamr_FOUND)
target_compile_options(wasm PRIVATE -DWAMR)
Expand Down
1 change: 1 addition & 0 deletions plugins/experimental/wasm/lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ endif()

add_library(wasmlib STATIC ${CC_FILES})
target_compile_options(wasmlib PUBLIC -Wno-unused-parameter)
target_link_libraries(wasmlib PRIVATE OpenSSL::Crypto)
if(wamr_FOUND)
target_compile_options(wasmlib PRIVATE -Wno-missing-field-initializers)
target_link_libraries(wasmlib PUBLIC wamr::wamr)
Expand Down