summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Kauffmann <johanneskauffmann@hotmail.com>2026-02-03 15:35:53 +0100
committerKhem Raj <raj.khem@gmail.com>2026-02-06 10:06:27 -0800
commit97ef9cc3b8834567ab6c1a2f0812d96f2d56154d (patch)
tree80df1fefdf49e4812e88d52ce4afd297edbd28e4
parent3c81ff5859809ee40abecb8e524c9091ebbbfacf (diff)
downloadmeta-openembedded-97ef9cc3b8834567ab6c1a2f0812d96f2d56154d.tar.gz
open62541: update to v1.4.15
The patch has been applied upstream. Signed-off-by: Johannes Kauffmann <johanneskauffmann@hotmail.com>
-rw-r--r--meta-networking/recipes-protocols/opcua/open62541/a725a263124ae8c87fe6af34a9b3a7981b7f116d.patch114
-rw-r--r--meta-networking/recipes-protocols/opcua/open62541_1.4.15.bb (renamed from meta-networking/recipes-protocols/opcua/open62541_1.4.14.bb)3
2 files changed, 1 insertions, 116 deletions
diff --git a/meta-networking/recipes-protocols/opcua/open62541/a725a263124ae8c87fe6af34a9b3a7981b7f116d.patch b/meta-networking/recipes-protocols/opcua/open62541/a725a263124ae8c87fe6af34a9b3a7981b7f116d.patch
deleted file mode 100644
index 6d038d4cba..0000000000
--- a/meta-networking/recipes-protocols/opcua/open62541/a725a263124ae8c87fe6af34a9b3a7981b7f116d.patch
+++ /dev/null
@@ -1,114 +0,0 @@
1From a725a263124ae8c87fe6af34a9b3a7981b7f116d Mon Sep 17 00:00:00 2001
2From: Johannes Kauffmann <johanneskauffmann@hotmail.com>
3Date: Wed, 10 Dec 2025 09:36:55 +0100
4Subject: [PATCH] fix(build): List private dependencies in .pc file
5
6In the "normal" case of linking to open62541.so, only -lopen62541 is
7needed in `Libs` because open62541's dependencies are not exposed via
8its public header files.
9
10All the other dependencies (`Requires.private` and `Libs.private`) only
11matter using open62541.a (linking statically via `pkg-config --static`).
12The crypto libraries and TMP2 library provide .pc files themselves, so
13we can list them in `Requires.private`. The other (direct) open62541
14dependencies are listed in `Libs.private`.
15
16Also reorder the .pc file (`Libs` comes last and `Requires(.private)
17comes` before `Cflags`).
18
19Fixes: #7574
20
21Upstream-Status: Submitted [https://github.com/open62541/open62541/pull/7588]
22---
23 CMakeLists.txt | 22 +++++++++++-----------
24 tools/open62541.pc.in | 4 +++-
25 2 files changed, 14 insertions(+), 12 deletions(-)
26
27diff --git a/CMakeLists.txt b/CMakeLists.txt
28index 91bf382fd71..6ef54a67847 100644
29--- a/CMakeLists.txt
30+++ b/CMakeLists.txt
31@@ -493,13 +493,18 @@ endif()
32
33 set(open62541_LIBRARIES "")
34 set(open62541_PUBLIC_LIBRARIES "")
35+set(pkgcfg_libsprivate "")
36+set(pkgcfg_requiresprivate "")
37 if("${UA_ARCHITECTURE}" STREQUAL "posix")
38 list(APPEND open62541_LIBRARIES "m")
39+ list(APPEND pkgcfg_libsprivate "-lm")
40 if(UA_MULTITHREADING GREATER_EQUAL 100 OR UA_BUILD_UNIT_TESTS)
41 list(APPEND open62541_PUBLIC_LIBRARIES "pthread")
42+ list(APPEND pkgcfg_libsprivate "-lpthread")
43 endif()
44 if(NOT APPLE AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD"))
45 list(APPEND open62541_LIBRARIES "rt")
46+ list(APPEND pkgcfg_libsprivate "-lrt")
47 endif()
48 elseif("${UA_ARCHITECTURE}" STREQUAL "win32")
49 list(APPEND open62541_LIBRARIES "ws2_32")
50@@ -511,6 +516,7 @@ if(UA_ENABLE_ENCRYPTION_OPENSSL)
51 # https://cmake.org/cmake/help/v3.13/module/FindOpenSSL.html
52 find_package(OpenSSL REQUIRED)
53 list(APPEND open62541_LIBRARIES "${OPENSSL_LIBRARIES}")
54+ list(APPEND pkgcfg_requiresprivate "openssl")
55 if(WIN32)
56 # Add bestcrypt for windows systems
57 list(APPEND open62541_LIBRARIES bcrypt)
58@@ -521,6 +527,7 @@ if(UA_ENABLE_ENCRYPTION_LIBRESSL)
59 # See https://github.com/libressl-portable/portable/blob/master/FindLibreSSL.cmake
60 find_package(LibreSSL REQUIRED)
61 list(APPEND open62541_LIBRARIES ${LIBRESSL_LIBRARIES})
62+ list(APPEND pkgcfg_requiresprivate "openssl")
63 if(WIN32)
64 # Add bestcrypt for random generator and ws2_32 for crypto
65 list(APPEND open62541_LIBRARIES ws2_32 bcrypt)
66@@ -533,6 +540,7 @@ if(UA_ENABLE_ENCRYPTION_MBEDTLS OR UA_ENABLE_PUBSUB_ENCRYPTION)
67 # defined in /tools/cmake/FindMbedTLS.cmake.
68 find_package(MbedTLS REQUIRED)
69 list(APPEND open62541_LIBRARIES ${MBEDTLS_LIBRARIES})
70+ list(APPEND pkgcfg_requiresprivate "mbedtls")
71 if(WIN32)
72 # Add bestcrypt for windows systems
73 list(APPEND open62541_LIBRARIES bcrypt)
74@@ -541,6 +549,7 @@ endif()
75
76 if(UA_ENABLE_TPM2_SECURITY)
77 list(APPEND open62541_LIBRARIES ${TPM2_LIB})
78+ list(APPEND pkgcfg_requiresprivate "tpm2-pkcs11")
79 endif()
80
81 if(MINGW)
82@@ -1531,17 +1540,8 @@ if(UA_ENABLE_AMALGAMATION)
83 set(PC_EXTRA_CFLAGS "-DUA_ENABLE_AMALGAMATION")
84 endif()
85
86-set(pkgcfgpubliclibs "")
87-foreach(lib ${open62541_PUBLIC_LIBRARIES})
88- set(pkgcfgpubliclibs "${pkgcfgpubliclibs}-l${lib} ")
89-endforeach()
90-
91-if(BUILD_SHARED_LIBS)
92- foreach(lib ${open62541_LIBRARIES})
93- set(pkgcfgpubliclibs "${pkgcfgpubliclibs}-l${lib} ")
94- endforeach()
95-endif()
96-
97+string(REPLACE ";" " " pkgcfg_requiresprivate "${pkgcfg_requiresprivate}")
98+string(REPLACE ";" " " pkgcfg_libsprivate "${pkgcfg_libsprivate}")
99 configure_file(tools/open62541.pc.in ${PROJECT_BINARY_DIR}/src_generated/open62541.pc @ONLY)
100
101 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
102diff --git a/tools/open62541.pc.in b/tools/open62541.pc.in
103index 50abf00af4e..a5986013c8e 100644
104--- a/tools/open62541.pc.in
105+++ b/tools/open62541.pc.in
106@@ -5,5 +5,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
107 Name: open62541
108 Description: open62541 is an open source C (C99) implementation of OPC UA
109 Version: @OPEN62541_VER_MAJOR@.@OPEN62541_VER_MINOR@.@OPEN62541_VER_PATCH@@OPEN62541_VER_LABEL@
110-Libs: -L${libdir} -lopen62541 @pkgcfgpubliclibs@
111+Requires.private: @pkgcfg_requiresprivate@
112 Cflags: -I${includedir} @PC_EXTRA_CFLAGS@
113+Libs: -L${libdir} -lopen62541
114+Libs.private: @pkgcfg_libsprivate@
diff --git a/meta-networking/recipes-protocols/opcua/open62541_1.4.14.bb b/meta-networking/recipes-protocols/opcua/open62541_1.4.15.bb
index 07efeac0ec..54c9145d15 100644
--- a/meta-networking/recipes-protocols/opcua/open62541_1.4.14.bb
+++ b/meta-networking/recipes-protocols/opcua/open62541_1.4.15.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "\
8" 8"
9 9
10SRCREV_FORMAT = "opcua_mdnsd_ua-nodeset_mqtt-c" 10SRCREV_FORMAT = "opcua_mdnsd_ua-nodeset_mqtt-c"
11SRCREV_opcua = "95dc4c1e9c8c4d3619f90b9c3fc3af194acb8b30" 11SRCREV_opcua = "45e4cd3ef6c79a8e503d37c9f5c89fefe90d99db"
12SRCREV_mdnsd = "488d24fb9d427aec77df180268f0291eeee7fb8b" 12SRCREV_mdnsd = "488d24fb9d427aec77df180268f0291eeee7fb8b"
13SRCREV_ua-nodeset = "d1bb6a22125bd7cd986272b1ee98a18a91d76fff" 13SRCREV_ua-nodeset = "d1bb6a22125bd7cd986272b1ee98a18a91d76fff"
14SRCREV_mqtt-c = "0f4c34c8cc00b16cfee094745d68b8cdbaecd8e0" 14SRCREV_mqtt-c = "0f4c34c8cc00b16cfee094745d68b8cdbaecd8e0"
@@ -18,7 +18,6 @@ SRC_URI = " \
18 git://github.com/Pro/mdnsd.git;name=mdnsd;protocol=https;branch=master;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/mdnsd \ 18 git://github.com/Pro/mdnsd.git;name=mdnsd;protocol=https;branch=master;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/mdnsd \
19 git://github.com/OPCFoundation/UA-Nodeset;name=ua-nodeset;protocol=https;branch=latest;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/ua-nodeset \ 19 git://github.com/OPCFoundation/UA-Nodeset;name=ua-nodeset;protocol=https;branch=latest;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/ua-nodeset \
20 git://github.com/LiamBindle/MQTT-C.git;name=mqtt-c;protocol=https;branch=master;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/mqtt-c \ 20 git://github.com/LiamBindle/MQTT-C.git;name=mqtt-c;protocol=https;branch=master;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/deps/mqtt-c \
21 file://a725a263124ae8c87fe6af34a9b3a7981b7f116d.patch \
22" 21"
23 22
24 23