Skip to content
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.

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

Added open62541 v1.4.1 #23882

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions recipes/open62541/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
sources:
"1.4.1":
url: "https://github.com/open62541/open62541/archive/v1.4.1.tar.gz"
sha256: "4f45f33e4ebd5241142817c4c61a94f2b1353304c8adf9091562bafab6ddb3da"
"1.3.9":
url: "https://github.com/open62541/open62541/archive/v1.3.9.tar.gz"
sha256: "71764d4a060cfa07eae7aaabd176da38b155ef01c63103513339699fd8026e2f"
"1.3.8":
url: "https://github.com/open62541/open62541/archive/v1.3.8.tar.gz"
sha256: "b6943b564787c4953b77ca8d7f987c4b896b3f3e91f45d9f13e9056b6148bc1d"
"1.2.6":
url: "https://github.com/open62541/open62541/archive/v1.2.6.tar.gz"
sha256: "7470c1e2f97d0e7dad9632ced7b62f0add66a3c689532204ef85b0556d129106"
Expand All @@ -15,11 +15,11 @@ sources:
url: "https://github.com/open62541/open62541/archive/v1.0.6.tar.gz"
sha256: "299940025c14929533064abe0044d5805ea50d52b32d05ad9bc0e6996569c2a6"
patches:
"1.3.9":
- patch_file: "patches/0001-disable-sanitizers-1_3_x.patch"
"1.4.1":
- patch_file: "patches/0001-disable-sanitizers-1_4_x.patch"
patch_description: "Disable static code analysis"
patch_type: "conan"
"1.3.8":
"1.3.9":
- patch_file: "patches/0001-disable-sanitizers-1_3_x.patch"
patch_description: "Disable static code analysis"
patch_type: "conan"
Expand Down
25 changes: 25 additions & 0 deletions recipes/open62541/all/patches/0001-disable-sanitizers-1_4_x.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b3c2cebc..c03cbe8f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -650,20 +650,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
# Linker
set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") # cmake sets -rdynamic by default

- # Debug
- if(UA_ENABLE_DEBUG_SANITIZER AND BUILD_TYPE_LOWER_CASE STREQUAL "debug" AND UNIX AND NOT UA_BUILD_OSS_FUZZ AND
- CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT UA_ENABLE_UNIT_TESTS_MEMCHECK)
- # Add default sanitizer settings when using clang and Debug build.
- # This allows e.g. CLion to find memory locations for SegFaults
- message(STATUS "Sanitizer enabled")
- set(SANITIZER_FLAGS "-g -fno-omit-frame-pointer -gline-tables-only -fsanitize=address -fsanitize-address-use-after-scope -fsanitize=leak -fsanitize=undefined")
- if(CMAKE_CXX_COMPILER_VERSION AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)
- set(SANITIZER_FLAGS "${SANITIZER_FLAGS} -fsanitize-coverage=trace-pc-guard")
- endif()
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SANITIZER_FLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SANITIZER_FLAGS}")
- endif()
-
if(NOT MINGW AND UA_ENABLE_HARDENING AND ((CMAKE_BUILD_TYPE STREQUAL "Release") OR (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")))
check_add_cc_flag("-D_FORTIFY_SOURCE=2") # run-time buffer overflow detection (needs at least -O1)
endif()
4 changes: 2 additions & 2 deletions recipes/open62541/all/submoduledata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ submodules:
sha256: a2bcc1cda0154091ecbed25b8c40436c5b75d11bb38df28b35a2ceedb331d562
url: https://github.com/OPCFoundation/UA-Nodeset/archive/Errata-1.04.5.zip
archive_pattern: "UA-Nodeset-{version}"
"1.3.8":
"1.3.9":
deps/ua-nodeset:
sha256: 032c93e3f7c335bbb2d2d699804a804c9cdce2a2ecc3fe7cde552f2130982c26
url: https://github.com/OPCFoundation/UA-Nodeset/archive/Glass=1.0.0-2022-01-01.zip
archive_pattern: "UA-Nodeset-{version}"
"1.3.9":
"1.4.1":
deps/ua-nodeset:
sha256: 032c93e3f7c335bbb2d2d699804a804c9cdce2a2ecc3fe7cde552f2130982c26
url: https://github.com/OPCFoundation/UA-Nodeset/archive/Glass=1.0.0-2022-01-01.zip
Expand Down
4 changes: 2 additions & 2 deletions recipes/open62541/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
versions:
"1.3.9":
"1.4.1":
folder: all
"1.3.8":
"1.3.9":
folder: all
"1.2.6":
folder: all
Expand Down