diff options
author | Roland Hieber <rhi@pengutronix.de> | 2023-02-13 10:31:17 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2023-02-17 09:30:23 +0100 |
commit | 0fd0cd09c0b609e1d32da0a71e45ab0bb45646a7 (patch) | |
tree | 488d79584d8dff2da8c865f462935a9102bd22ac /rules/open62541.make | |
parent | fd5da21491dd93db75c41222c0ddf89a05c3996b (diff) | |
download | ptxdist-0fd0cd09c0b609e1d32da0a71e45ab0bb45646a7.tar.gz ptxdist-0fd0cd09c0b609e1d32da0a71e45ab0bb45646a7.tar.xz |
open62541: version bump 1.2 -> 1.3.4
Update CMake options, and replace the remaining patch with the version
that was merged upstream after the 1.3.4 release.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
Message-Id: <20230213093117.1865063-2-rhi@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/open62541.make')
-rw-r--r-- | rules/open62541.make | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/rules/open62541.make b/rules/open62541.make index ac2b58829..183e40800 100644 --- a/rules/open62541.make +++ b/rules/open62541.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_OPEN62541) += open62541 # # Paths and names # -OPEN62541_VERSION := 1.2 -OPEN62541_MD5 := 90034b0cf1714f9bf1d94ec2b17f3086 +OPEN62541_VERSION := 1.3.4 +OPEN62541_MD5 := a3871da1723b0d436564d643e169879e OPEN62541 := open62541-$(OPEN62541_VERSION) OPEN62541_SUFFIX := tar.gz OPEN62541_URL := https://github.com/open62541/open62541/archive/v$(OPEN62541_VERSION)/$(OPEN62541).$(OPEN62541_SUFFIX) @@ -25,6 +25,8 @@ OPEN62541_DIR := $(BUILDDIR)/$(OPEN62541) OPEN62541_LICENSE := MPL-2.0 OPEN62541_LICENSE_FILES := file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad +# use tarballs instead of git submodules +# see https://github.com/open62541/open62541/tree/v$(version)/deps OPEN62541_MDNSD_VERSION := 3151afe5899dba5125dffa9f4cf3ae1fe2edc0f0 OPEN62541_MDNSD_MD5 := 75c45c7913b33f92a7be460bce593991 OPEN62541_MDNSD := open62541-mdnsd-$(OPEN62541_MDNSD_VERSION) @@ -78,40 +80,44 @@ OPEN62541_CONF_OPT := \ -DUA_ENABLE_AMALGAMATION=OFF \ -DUA_ENABLE_COVERAGE=OFF \ -DUA_ENABLE_DA=ON \ - -DUA_ENABLE_CUSTOM_NODESTORE=OFF \ -DUA_ENABLE_DETERMINISTIC_RNG=OFF \ + -DUA_ENABLE_DIAGNOSTICS=OFF \ -DUA_ENABLE_DISCOVERY=ON \ -DUA_ENABLE_DISCOVERY_MULTICAST=ON \ -DUA_ENABLE_DISCOVERY_SEMAPHORE=ON \ -DUA_ENABLE_ENCRYPTION=ON \ -DUA_ENABLE_EXPERIMENTAL_HISTORIZING=OFF \ -DUA_ENABLE_HARDENING=ON \ + -DUA_ENABLE_ENCRYPTION_TPM2=OFF \ -DUA_ENABLE_HISTORIZING=ON \ -DUA_ENABLE_IMMUTABLE_NODES=ON \ -DUA_ENABLE_JSON_ENCODING=OFF \ -DUA_ENABLE_MALLOC_SINGLETON=OFF \ -DUA_ENABLE_METHODCALLS=ON \ - -DUA_ENABLE_MICRO_EMB_DEV_PROFILE=ON \ - -DUA_ENABLE_MULTITHREADING=200 \ -DUA_ENABLE_NODEMANAGEMENT=ON \ -DUA_ENABLE_NODESET_COMPILER_DESCRIPTIONS=ON \ -DUA_ENABLE_PUBSUB=ON \ + -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \ -DUA_ENABLE_PUBSUB_ETH_UADP=ON \ -DUA_ENABLE_PUBSUB_DELTAFRAMES=ON \ -DUA_ENABLE_PUBSUB_INFORMATIONMODEL=ON \ -DUA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS=ON \ - -DUA_ENABLE_PUBSUB_CUSTOM_PUBLISH_HANDLING=OFF \ -DUA_ENABLE_QUERY=ON \ -DUA_ENABLE_STATIC_ANALYZER=OFF \ -DUA_ENABLE_STATUSCODE_DESCRIPTIONS=ON \ -DUA_ENABLE_SUBSCRIPTIONS=ON \ -DUA_ENABLE_SUBSCRIPTIONS_EVENTS=ON \ - -DUA_ENABLE_TYPENAMES=ON \ -DUA_ENABLE_UNIT_TEST_FAILURE_HOOKS=OFF \ -DUA_ENABLE_UNIT_TESTS_MEMCHECK=OFF \ -DUA_ENABLE_VALGRIND_INTERACTIVE=OFF \ - -DUA_COMPILE_AS_CXX=OFF \ -DUA_FILE_NS0="" \ + -DUA_FORCE_WERROR=OFF \ + -DUA_LOGLEVEL=$(OPEN62541_LOGLEVEL) \ + -DUA_MSVC_FORCE_STATIC_CRT=OFF \ + -DUA_MULTITHREADING=200 \ + -DUA_NAMESPACE_ZERO=FULL \ + -DUA_NODESET_DIR="$(PTXDIST_SYSROOT_HOST)/usr/share/ua-nodeset" \ + -DUA_PACK_DEBIAN=OFF -DUA_LOGLEVEL=$(OPEN62541_LOGLEVEL) \ -DUA_MSVC_FORCE_STATIC_CRT=OFF \ -DUA_NAMESPACE_ZERO=FULL \ |