From 35befff3be8d8d03d9eb52d24a8998109cf4c3b7 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 15 Jun 2022 18:17:49 +0200 Subject: [PATCH] package/open62541: bump to version 1.3.1 Remove patches: 0001-CMakeLists.txt-project-only-contains-C-code.patch is replaced by upstream commit df0fdefa967ae2523b7c90d61a0c8bc539ec2a69 which does more, but addresses the same problem. 0002-arch-posix-CMakeLists.txt-fix-build-without-threads.patch is upstream in commit c0298a9a6bfcc20cadaf54af640d82cabadfb64e. 0003-fix-core-Explicit-cast-to-avoid-compiler-warning.patch is upstream in commit 0c53fd776af9631c915c8722e1d68ce9a69fa3f6. 0004-CMakeLists.txt-add-UA_FORCE_WERROR.patch is upstream in commit 5edb3a0283a8ea40de7f8cfa82aed2b16d95cf3e. Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- ...sts.txt-project-only-contains-C-code.patch | 27 ---------- ...eLists.txt-fix-build-without-threads.patch | 37 ------------- ...licit-cast-to-avoid-compiler-warning.patch | 25 --------- ...4-CMakeLists.txt-add-UA_FORCE_WERROR.patch | 54 ------------------- package/open62541/open62541.hash | 2 +- package/open62541/open62541.mk | 2 +- 6 files changed, 2 insertions(+), 145 deletions(-) delete mode 100644 package/open62541/0001-CMakeLists.txt-project-only-contains-C-code.patch delete mode 100644 package/open62541/0002-arch-posix-CMakeLists.txt-fix-build-without-threads.patch delete mode 100644 package/open62541/0003-fix-core-Explicit-cast-to-avoid-compiler-warning.patch delete mode 100644 package/open62541/0004-CMakeLists.txt-add-UA_FORCE_WERROR.patch diff --git a/package/open62541/0001-CMakeLists.txt-project-only-contains-C-code.patch b/package/open62541/0001-CMakeLists.txt-project-only-contains-C-code.patch deleted file mode 100644 index 52a9cbaac5..0000000000 --- a/package/open62541/0001-CMakeLists.txt-project-only-contains-C-code.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 61f9440dfeacad517965451773371aca0332d700 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 5 Jan 2021 23:08:53 +0100 -Subject: [PATCH] CMakeLists.txt: project only contains C code - -Make sure CMake doesn't check for a C++ compiler when it's not needed, -as open62541 is in C. - -Signed-off-by: Thomas Petazzoni ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 94ceb127..acc41ab2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - cmake_minimum_required(VERSION 3.0...3.12) --project(open62541) -+project(open62541 C) - # set(CMAKE_VERBOSE_MAKEFILE ON) - if(${CMAKE_VERSION} VERSION_LESS 3.12) - cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}) --- -2.29.2 - diff --git a/package/open62541/0002-arch-posix-CMakeLists.txt-fix-build-without-threads.patch b/package/open62541/0002-arch-posix-CMakeLists.txt-fix-build-without-threads.patch deleted file mode 100644 index bdf3608041..0000000000 --- a/package/open62541/0002-arch-posix-CMakeLists.txt-fix-build-without-threads.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a312e82124fb8c9f139d5a40fa5a28123bb77a33 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 10 Jan 2021 14:25:56 +0100 -Subject: [PATCH] arch/posix/CMakeLists.txt: fix build without threads - -Fix the following build failure without threads: - -[100%] Linking C shared library bin/libopen62541.so -/home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/8.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: cannot find -lpthread -collect2: error: ld returned 1 exit status -CMakeFiles/open62541.dir/build.make:192: recipe for target 'bin/libopen62541.so.0.0.0' failed -make[3]: *** [bin/libopen62541.so.0.0.0] Error 1 - -Fixes: - - http://autobuild.buildroot.org/results/87ec3c987c991f790757276316d6caf81e635fa2 - -Signed-off-by: Fabrice Fontaine ---- - arch/posix/CMakeLists.txt | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/arch/posix/CMakeLists.txt b/arch/posix/CMakeLists.txt -index bb24757c..a53c9f2c 100644 ---- a/arch/posix/CMakeLists.txt -+++ b/arch/posix/CMakeLists.txt -@@ -20,8 +20,6 @@ if (${_index} GREATER -1 OR "${UA_ARCHITECTURE}" STREQUAL "posix") - ua_architecture_append_to_library(netdb ndblib socket) - else() - ua_architecture_append_to_library(m) -- #TODO - Error on first make run if pthread is included conditional? -- ua_architecture_append_to_library(pthread) - if(UA_MULTITHREADING OR UA_BUILD_UNIT_TESTS) - ua_architecture_append_to_library(pthread) - endif() --- -2.29.2 - diff --git a/package/open62541/0003-fix-core-Explicit-cast-to-avoid-compiler-warning.patch b/package/open62541/0003-fix-core-Explicit-cast-to-avoid-compiler-warning.patch deleted file mode 100644 index dea325c17f..0000000000 --- a/package/open62541/0003-fix-core-Explicit-cast-to-avoid-compiler-warning.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0c53fd776af9631c915c8722e1d68ce9a69fa3f6 Mon Sep 17 00:00:00 2001 -From: Andreas Walter -Date: Fri, 26 Feb 2021 11:49:25 +0100 -Subject: [PATCH] fix(core): Explicit cast to avoid compiler warning (#4203) - -[Retrieved from: -https://github.com/open62541/open62541/commit/0c53fd776af9631c915c8722e1d68ce9a69fa3f6] -Signed-off-by: Fabrice Fontaine ---- - src/ua_types_encoding_binary.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ua_types_encoding_binary.c b/src/ua_types_encoding_binary.c -index 0fe88eb98e0..abbd23735d3 100644 ---- a/src/ua_types_encoding_binary.c -+++ b/src/ua_types_encoding_binary.c -@@ -319,7 +319,7 @@ static long double - unpack754(uint64_t i, unsigned bits, unsigned expbits) { - unsigned significandbits = bits - expbits - 1; - long double result = (long double)(i&(uint64_t)((1LL<>significandbits) & (uint64_t)((1LL< -Date: Mon, 2 Aug 2021 09:49:48 +0200 -Subject: [PATCH] CMakeLists.txt: add UA_FORCE_WERROR - -Allow the user to disable -Werror to avoid the following build failures: - -/tmp/instance-0/output-1/build/open62541-v1.2.2/arch/network_tcp.c: In function 'connection_recv': -/tmp/instance-0/output-1/build/open62541-v1.2.2/arch/network_tcp.c:96:5: error: conversion to 'unsigned int' from 'int' may change the sign of the result [-Werror=sign-conversion] - 96 | UA_fd_set(connection->sockfd, &fdset); - | ^~~~~~~~~ - -/tmp/instance-6/output-1/build/open62541-v1.2.2/plugins/ua_pubsub_udp.c: In function 'UA_PubSubChannelUDPMC_receive': -/tmp/instance-6/output-1/build/open62541-v1.2.2/plugins/ua_pubsub_udp.c:477:21: error: conversion to '__suseconds_t' {aka 'int'} from 'UA_UInt32' {aka 'unsigned int'} may change the sign of the result [-Werror=sign-conversion] - 477 | tmptv.tv_usec = (long int)(timeout % 1000000); - | ^ - -Fixes: - - http://autobuild.buildroot.org/results/911811de81d8abb2a31feb8f27af1592641c6fbc - - http://autobuild.buildroot.org/results/f0187b3f2d62e955fddeef4e90f84ba4fd642bd2 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/open62541/open62541/pull/4572] ---- - CMakeLists.txt | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bc839f27..963460d0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -257,6 +257,8 @@ if(UA_FORCE_CPP) - add_definitions(-D__STDC_CONSTANT_MACROS) # We need the UINT32_C define - endif() - -+option(UA_FORCE_WERROR "Force compilation with -Werror" ON) -+ - #General PubSub setup - option(UA_ENABLE_PUBSUB "Enable publish/subscribe" OFF) - mark_as_advanced(UA_ENABLE_PUBSUB) -@@ -526,7 +528,9 @@ if(NOT UA_FORCE_CPP AND (CMAKE_COMPILER_IS_GNUCC OR "x${CMAKE_C_COMPILER_ID}" ST - check_add_cc_flag("-Wall") # Warnings - check_add_cc_flag("-Wextra") # More warnings - check_add_cc_flag("-Wpedantic") # Standard compliance -- check_add_cc_flag("-Werror") # All warnings are errors -+ if(UA_FORCE_WERROR) -+ check_add_cc_flag("-Werror") # All warnings are errors -+ endif() - - check_add_cc_flag("-Wno-static-in-inline") # Clang doesn't like the use of static inline methods inside static inline methods - check_add_cc_flag("-Wno-overlength-strings") # May happen in the nodeset compiler when complex values are directly encoded --- -2.30.2 - diff --git a/package/open62541/open62541.hash b/package/open62541/open62541.hash index 3257bfe477..c7234fd814 100644 --- a/package/open62541/open62541.hash +++ b/package/open62541/open62541.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e2e1b8e6285c4fd6d8e07f37d61a8728376d525e169fadb3d61918fa6a7c271a open62541-v1.2.4-br1.tar.gz +sha256 b8f4bf73d50d3dc0e2e7343f03df7cd07ad169ff66056d5c392215662b1f8fc8 open62541-v1.3.1-br1.tar.gz sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk index 87bd3449b7..1958befae5 100644 --- a/package/open62541/open62541.mk +++ b/package/open62541/open62541.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPEN62541_VERSION = v1.2.4 +OPEN62541_VERSION = v1.3.1 OPEN62541_SITE_METHOD = git OPEN62541_SITE = https://github.com/open62541/open62541.git OPEN62541_GIT_SUBMODULES = YES