diff --git a/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch b/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch index 8575797e89..f8eadb3ee6 100644 --- a/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch +++ b/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch @@ -17,14 +17,14 @@ Updated comment and content after fixing some tests. Left only MongoDBTest.testArray on ignore list, untested. --- - cppignore.lnx | 9 +++++++++ - 1 file changed, 9 insertions(+) + cppignore.lnx | 1 + + 1 file changed, 1 insertion(+) diff --git a/cppignore.lnx b/cppignore.lnx index b3288d474..9aad48ca5 100644 --- a/cppignore.lnx +++ b/cppignore.lnx -@@ -30,3 +30,4 @@ CppUnit::TestCaller.testProxy +@@ -35,3 +35,4 @@ CppUnit::TestCaller.testProxy CppUnit::TestCaller.testProxy CppUnit::TestCaller.testHostByAddress CppUnit::TestCaller.testHostByName diff --git a/meta-oe/recipes-support/poco/poco/0002-DataTest-disable-testSQLChannel-test.patch b/meta-oe/recipes-support/poco/poco/0002-DataTest-disable-testSQLChannel-test.patch index 7628a8625a..38028c1cf8 100644 --- a/meta-oe/recipes-support/poco/poco/0002-DataTest-disable-testSQLChannel-test.patch +++ b/meta-oe/recipes-support/poco/poco/0002-DataTest-disable-testSQLChannel-test.patch @@ -15,7 +15,7 @@ diff --git a/Data/testsuite/src/DataTest.cpp b/Data/testsuite/src/DataTest.cpp index e18b87edc..60fd266c3 100644 --- a/Data/testsuite/src/DataTest.cpp +++ b/Data/testsuite/src/DataTest.cpp -@@ -1648,7 +1648,7 @@ CppUnit::Test* DataTest::suite() +@@ -1659,7 +1659,7 @@ CppUnit::Test* DataTest::suite() CppUnit_addTest(pSuite, DataTest, testExternalBindingAndExtraction); CppUnit_addTest(pSuite, DataTest, testTranscode); CppUnit_addTest(pSuite, DataTest, testSQLParse); diff --git a/meta-oe/recipes-support/poco/poco_1.15.0.bb b/meta-oe/recipes-support/poco/poco_1.15.1.bb similarity index 94% rename from meta-oe/recipes-support/poco/poco_1.15.0.bb rename to meta-oe/recipes-support/poco/poco_1.15.1.bb index a22694031a..7dd87606ef 100644 --- a/meta-oe/recipes-support/poco/poco_1.15.0.bb +++ b/meta-oe/recipes-support/poco/poco_1.15.1.bb @@ -13,7 +13,7 @@ SRC_URI = "git://github.com/pocoproject/poco.git;branch=poco-${PV};protocol=http file://0002-DataTest-disable-testSQLChannel-test.patch \ file://run-ptest \ " -SRCREV = "52c558fbcda0578467e4f59c96961eb629ed3c77" +SRCREV = "a1aacbba1bda4301db01bb1a2c2ab80677756b90" UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P\d+(\.\d+)+)" @@ -126,12 +126,8 @@ PACKAGES_DYNAMIC = "poco-.*" ALLOW_EMPTY:${PN} = "1" # cppunit and datatest is only built if tests are enabled -# Upstream only ships libCppUnit.so.1 + symlink libCppUnit.so (no patch version), -# so split: runtime in poco-cppunit, dev symlink in poco-cppunit-dev -PACKAGES =+ "${PN}-cppunit-dev ${PN}-cppunit ${PN}-datatest" -FILES:${PN}-cppunit-dev += "${libdir}/libCppUnit.so" -RDEPENDS:${PN}-cppunit-dev += "${PN}-cppunit" -FILES:${PN}-cppunit += "${libdir}/libCppUnit.so.1" +PACKAGES =+ "${PN}-cppunit ${PN}-datatest" +FILES:${PN}-cppunit += "${libdir}/libCppUnit.so*" ALLOW_EMPTY:${PN}-cppunit = "1" FILES:${PN}-datatest += "${libdir}/libPocoDataTest.so*" ALLOW_EMPTY:${PN}-datatest = "1"