diff --git a/README b/README index f7d64d3..24df75d 100644 --- a/README +++ b/README @@ -37,7 +37,7 @@ II. Misc The layer contains two recipes for OpenDDS: one versioned and one not. -If PREFERRED_VERSION is not specifed in your local.conf then the OpenDDS 3.24 recipe will be +If PREFERRED_VERSION is not specifed in your local.conf then the OpenDDS 3.26.1 recipe will be selected for build by default The versioned recipe will download and build with DOC Group ACE/TAO v2 by default. diff --git a/conf/layer.conf b/conf/layer.conf index 9c89406..b0b3b19 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "opendds-layer" BBFILE_PATTERN_opendds-layer = "^${LAYERDIR}/" BBFILE_PRIORITY_opendds-layer = "6" -LAYERSERIES_COMPAT_opendds-layer = "honister kirkstone" +LAYERSERIES_COMPAT_opendds-layer = "kirkstone nanbield" LAYERDEPENDS_opendds-layer = "core" LICENSE_PATH += "${LAYERDIR}/licenses" diff --git a/recipes-connectivity/opendds/opendds.inc b/recipes-connectivity/opendds/opendds.inc index 54ec4e9..98d9b01 100644 --- a/recipes-connectivity/opendds/opendds.inc +++ b/recipes-connectivity/opendds/opendds.inc @@ -1,20 +1,26 @@ SUMMARY = "OpenDDS is an open source C++ implementation of the Object Management Group (OMG) Data Distribution Service (DDS)" HOMEPAGE = "https://opendds.org" +BUGTRACKER = "https://github.com/OpenDDS/OpenDDS/issues" LICENSE = "OpenDDS" LIC_FILES_CHKSUM = "file://LICENSE;md5=11ee76f6fb51f69658b5bb8327c50b11" inherit autotools -DEPENDS += " \ - perl-native \ +DEPENDS += "\ cmake-native \ opendds-native \ openssl \ - xerces-c \ + perl-native \ + xerces-c \ " -RDEPENDS:${PN}-dev += " coreutils perl bash make" +RDEPENDS:${PN}-dev += "\ + bash \ + coreutils \ + make \ + perl \ +" S = "${WORKDIR}/git" diff --git a/recipes-connectivity/opendds/opendds/0002-fixing-DoAll-testing-DoAll.patch b/recipes-connectivity/opendds/opendds/0002-fixing-DoAll-testing-DoAll.patch new file mode 100644 index 0000000..7bc8a85 --- /dev/null +++ b/recipes-connectivity/opendds/opendds/0002-fixing-DoAll-testing-DoAll.patch @@ -0,0 +1,71 @@ +From e565d7fb4d9d83884afd38e89864b597241d00eb Mon Sep 17 00:00:00 2001 +From: Jan Vermaete +Date: Sat, 30 Dec 2023 14:30:02 +0100 +Subject: [PATCH 2/2] fixing DoAll -> testing::DoAll + +| ...3.26.1/recipe-sysroot/usr/include/gmock/gmock-actions.h:1783:61: note: 'testing::DoAll' declared here +| 1783 | internal::DoAllAction::type...> DoAll( +| | ^~~~~ + +Upstream-Status: Accepted [https://github.com/OpenDDS/OpenDDS/commit/cccdfcf53857e75ec479a0465a1318b669951290] + +Signed-off-by: Jan Vermaete +--- + tests/unit-tests/dds/DCPS/Qos_Helper.cpp | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/tests/unit-tests/dds/DCPS/Qos_Helper.cpp b/tests/unit-tests/dds/DCPS/Qos_Helper.cpp +index 53e2cb30d..0d6cb1c55 100644 +--- a/tests/unit-tests/dds/DCPS/Qos_Helper.cpp ++++ b/tests/unit-tests/dds/DCPS/Qos_Helper.cpp +@@ -1457,7 +1457,7 @@ TEST(dds_DCPS_Qos_Helper, DataWriterQosBuilder_Publisher_ctor) + qos.reliability_best_effort(); + OpenDDS::DCPS::RcHandle publisher = OpenDDS::DCPS::make_rch(); + EXPECT_CALL(*publisher, get_default_datawriter_qos(testing::_)) +- .WillOnce(DoAll(testing::SetArgReferee<0>(qos.qos()), testing::Return(DDS::RETCODE_OK))); ++ .WillOnce(testing::DoAll(testing::SetArgReferee<0>(qos.qos()), testing::Return(DDS::RETCODE_OK))); + DDS::Publisher_var publisher_var = DDS::Publisher::_duplicate(publisher.in()); + OpenDDS::DCPS::DataWriterQosBuilder uut(publisher_var); + EXPECT_EQ(qos, uut); +@@ -1513,12 +1513,12 @@ TEST(dds_DCPS_Qos_Helper, DataWriterQosBuilder_Topic_ctor) + + OpenDDS::DCPS::RcHandle topic = OpenDDS::DCPS::make_rch(); + EXPECT_CALL(*topic, get_qos(testing::_)) +- .WillOnce(DoAll(testing::SetArgReferee<0>(topic_qos.qos()), testing::Return(DDS::RETCODE_OK))); ++ .WillOnce(testing::DoAll(testing::SetArgReferee<0>(topic_qos.qos()), testing::Return(DDS::RETCODE_OK))); + DDS::Topic_var topic_var = DDS::Topic::_duplicate(topic.in()); + + OpenDDS::DCPS::RcHandle publisher = OpenDDS::DCPS::make_rch(); + EXPECT_CALL(*publisher, get_default_datawriter_qos(testing::_)) +- .WillOnce(DoAll(testing::SetArgReferee<0>(datawriter_qos.qos()), testing::Return(DDS::RETCODE_OK))); ++ .WillOnce(testing::DoAll(testing::SetArgReferee<0>(datawriter_qos.qos()), testing::Return(DDS::RETCODE_OK))); + EXPECT_CALL(*publisher, copy_from_topic_qos(testing::_, testing::_)) + .WillOnce(testing::DoAll(testing::Invoke(copy_from_topic1), testing::Return(DDS::RETCODE_OK))); + DDS::Publisher_var publisher_var = DDS::Publisher::_duplicate(publisher.in()); +@@ -1927,7 +1927,7 @@ TEST(dds_DCPS_Qos_Helper, DataReaderQosBuilder_Subscriber_ctor) + qos.reliability_best_effort(); + OpenDDS::DCPS::RcHandle subscriber = OpenDDS::DCPS::make_rch(); + EXPECT_CALL(*subscriber, get_default_datareader_qos(testing::_)) +- .WillOnce(DoAll(testing::SetArgReferee<0>(qos.qos()), testing::Return(DDS::RETCODE_OK))); ++ .WillOnce(testing::DoAll(testing::SetArgReferee<0>(qos.qos()), testing::Return(DDS::RETCODE_OK))); + DDS::Subscriber_var subscriber_var = DDS::Subscriber::_duplicate(subscriber.in()); + OpenDDS::DCPS::DataReaderQosBuilder uut(subscriber_var); + EXPECT_EQ(qos, uut); +@@ -1979,12 +1979,12 @@ TEST(dds_DCPS_Qos_Helper, DataReaderQosBuilder_Topic_ctor) + + OpenDDS::DCPS::RcHandle topic = OpenDDS::DCPS::make_rch(); + EXPECT_CALL(*topic, get_qos(testing::_)) +- .WillOnce(DoAll(testing::SetArgReferee<0>(topic_qos.qos()), testing::Return(DDS::RETCODE_OK))); ++ .WillOnce(testing::DoAll(testing::SetArgReferee<0>(topic_qos.qos()), testing::Return(DDS::RETCODE_OK))); + DDS::Topic_var topic_var = DDS::Topic::_duplicate(topic.in()); + + OpenDDS::DCPS::RcHandle subscriber = OpenDDS::DCPS::make_rch(); + EXPECT_CALL(*subscriber, get_default_datareader_qos(testing::_)) +- .WillOnce(DoAll(testing::SetArgReferee<0>(datareader_qos.qos()), testing::Return(DDS::RETCODE_OK))); ++ .WillOnce(testing::DoAll(testing::SetArgReferee<0>(datareader_qos.qos()), testing::Return(DDS::RETCODE_OK))); + EXPECT_CALL(*subscriber, copy_from_topic_qos(testing::_, testing::_)) + .WillOnce(testing::DoAll(testing::Invoke(copy_from_topic2), testing::Return(DDS::RETCODE_OK))); + DDS::Subscriber_var subscriber_var = DDS::Subscriber::_duplicate(subscriber.in()); +-- +2.39.2 + diff --git a/recipes-connectivity/opendds/opendds_3.24.bb b/recipes-connectivity/opendds/opendds_3.26.1.bb similarity index 57% rename from recipes-connectivity/opendds/opendds_3.24.bb rename to recipes-connectivity/opendds/opendds_3.26.1.bb index c1fc478..0318ab3 100644 --- a/recipes-connectivity/opendds/opendds_3.24.bb +++ b/recipes-connectivity/opendds/opendds_3.26.1.bb @@ -1,23 +1,26 @@ # Specify SHA-1 for the release to avoid constantly checking the upstream repo. -SRCREV = "9ededb80594119d8d54b1622cc68f4666b1479a5" -DDS_SRC_BRANCH = "branch-DDS-3.24" -SRC_URI = "git://github.com/OpenDDS/OpenDDS.git;protocol=https;branch=${DDS_SRC_BRANCH};name=opendds" +SRCREV = "3d7f89e8243fbf382ce6374f900489e76894d4f9" +DDS_SRC_BRANCH = "branch-DDS-3.26" +SRC_URI = "\ + git://github.com/OpenDDS/OpenDDS.git;protocol=https;branch=${DDS_SRC_BRANCH};name=opendds \ + file://0002-fixing-DoAll-testing-DoAll.patch \ +" require opendds.inc -DOC_TAO2_VERSION = "6.5.19" -DOC_TAO3_VERSION = "7.1.0" +DOC_TAO2_VERSION = "6.5.20" +DOC_TAO3_VERSION = "7.1.1" -DOC_TAO2_SHA256SUM = "e0d5faf9ec6fa457747776293eab2c71502109b6655de0e62f30dace04af809c" -DOC_TAO3_SHA256SUM = "6ad3d87dcafd8b60d35bc3b483d2aa010ceacdc89e426af5d98933839f22fbea" +DOC_TAO2_SHA256SUM = "7546d11785dc7e03b578c82f39cc9ddb8b574685453e8479ac8765827e9936ad" +DOC_TAO3_SHA256SUM = "69ec3a8afffc16694a65550776b6fa8fc60846c5e3530bb7d74191bf4a43c711" DOC_TAO2_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE+TAO-${@'${DOC_TAO2_VERSION}'.replace('.','_')}/ACE+TAO-src-${DOC_TAO2_VERSION}.tar.gz" DOC_TAO3_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE+TAO-${@'${DOC_TAO3_VERSION}'.replace('.','_')}/ACE+TAO-src-${DOC_TAO3_VERSION}.tar.gz" ACE_TAO_OPTION ??= "" -ACE_TAO_URI ??= "${DOC_TAO2_URI}" -ACE_TAO_SHA256SUM ??= "${DOC_TAO2_SHA256SUM}" +ACE_TAO_URI ??= "${DOC_TAO2_URI}" +ACE_TAO_SHA256SUM ??= "${DOC_TAO2_SHA256SUM}" python () { if d.getVar('ACE_TAO_OPTION') == '--doc-group3': diff --git a/recipes-connectivity/opendds/opendds_git.bb b/recipes-connectivity/opendds/opendds_git.bb index b6bdd41..bd3ac18 100644 --- a/recipes-connectivity/opendds/opendds_git.bb +++ b/recipes-connectivity/opendds/opendds_git.bb @@ -17,7 +17,7 @@ PV = "1.0+git${SRCPV}" DDS_SRC_BRANCH ??= "master" SRC_URI = "git://github.com/objectcomputing/OpenDDS.git;protocol=https;branch=${DDS_SRC_BRANCH}" -OECONF = " \ +OECONF = "\ --ace-github-latest \ "